]{memoir} % paper size, font size and other options for document
\input{common/packages.tex} % common packages
+\input{common/settings.tex}
+
\begin{document}
\input{common/title.tex} % create and use custom title page
\include{parts/Editing}
\include{parts/Rendering}
\include{parts/Keyframes}
-<<<<<<< HEAD
-=======
+\include{parts/FFmpeg}
+\include{parts/Plugins}
+\include{parts/Transition}
+\include{parts/Overlays}
+\include{parts/Recording}
+\include{parts/DVD}
+\include{parts/Multi5s}
+
+\include{parts/Glossary}
\printnomenclature % print glossary
-\nomenclature{t}{test} % remove this after adding actual glosssary item
+
\newpage
\listoftables
\newpage
\listoftodos
->>>>>>> einhander
\end{document}