7 files changed, 251 insertions, 26 deletions

diff --git a/report/document.tex b/report/document.tex
index 007276a..981ecf3 100644
--- a/report/document.tex
+++ b/report/document.tex
@@ -25,17 +25,39 @@
 
 \input{cover}
 
-\clearpage
-%\cleardoublepage
+%\clearpage
+\cleardoublepage
 
 \tableofcontents*
 
-\clearpage
-
+%\clearpage
+\cleardoublepage
 
 \input{project}
 
-\input{work}
+\cleardoublepage
+
+\input{progression}
+
+\cleardoublepage
+
+\input{organization}
+
+\cleardoublepage
+
+\input{tools}
+
+\cleardoublepage
+
+
+\begin{appendices}
+
+\input{userguide}
+
+\end{appendices}
+
+
+\cleardoublepage
 
 \bibliographystyle{unsrt}
 \bibliography{bibliography}
diff --git a/report/organization.tex b/report/organization.tex
new file mode 100644
index 0000000..4ca7bc6
--- /dev/null
+++ b/report/organization.tex
@@ -0,0 +1,5 @@
+\chapter{Work organization}
+
+\section{Schedule}
+
+\section{Task assignments}
diff --git a/report/progression.tex b/report/progression.tex
new file mode 100644
index 0000000..cef3a50
--- /dev/null
+++ b/report/progression.tex
@@ -0,0 +1,198 @@
+\chapter{Work progression}
+
+\section{Zuul bad}
+
+
+
+
+
+\section{Zuul better v1}
+
+\subsection{printLocationInfo}
+
+\subsection{getExit}
+
+\subsection{getExitString}
+
+\subsection{HashMap, setExit}
+
+\subsection{Vertical direction}
+
+\subsection{keySet}
+
+\subsection{getExitString ?}
+
+\subsection{getLongDescription}
+
+\subsection{Object diagram}
+
+\subsubsection{Changes on execution}
+
+
+\section{Zuul with features}
+
+\subsection{look}
+
+\subsection{eat}
+
+
+\section{Zuul better v2}
+
+\subsection{showAll, showCommands}
+
+\subsection{Adding commands}
+
+\subsection{getCommandList}
+
+\subsection{Comparison with reference}
+
+\subsection{StringBuilder}
+
+\subsection{Room objects}
+
+
+\section{Zuul with images}
+
+\subsection{Game, GameEngine, UserInterface}
+
+\subsection{Parser/Scanner}
+
+\subsection{UserInterface.addActionListener()}
+
+\subsection{UserInterface.actionPerformed()}
+
+
+\section{Zuul MVC}
+
+\subsection{Structure}
+
+
+\section{Zuul with items v1}
+
+\subsection{Item}
+
+\subsection{item description}
+
+\subsection{items}
+
+\subsection{Collection choice}
+
+
+\section{Zuul with history}
+
+\subsection{back}
+
+\subsection{back test}
+
+\subsection{back back}
+
+\subsection{Stack}
+
+
+\section{Zuul with tests}
+
+\subsection{tests}
+
+\subsubsection{Automatic tests}
+
+\subsection{test command}
+
+
+\section{Zuul with items v2}
+
+\subsection{Player}
+
+\subsection{take, drop}
+
+\subsection{Carry several items}
+
+\subsection{ItemList}
+
+\subsection{Maximum weight}
+
+\subsection{Inventory}
+
+\subsection{Magic cookie}
+
+\subsection{Tests}
+
+
+\section{Zuul with enums}
+
+\subsection{switch}
+
+\subsection{look with enum}
+
+\subsection{help with enum}
+
+
+\section{Zuul extended}
+
+\subsection{Time limit}
+
+\subsubsection{Real time}
+
+\subsection{GUI}
+
+\subsection{Trap door}
+
+\subsection{Beamer}
+
+\subsection{Locked door}
+
+\subsection{Tests}
+
+\subsection{Transporter room}
+
+\subsubsection{alea}
+
+\subsection{Inheritance}
+
+\subsection{Abstract Command}
+
+\subsection{Packages}
+
+\subsection{Character}
+
+\subsubsection{Moving character}
+
+
+\section{Zuul without BlueJ}
+
+\subsection{main}
+
+\subsection{jar}
+
+\subsection{JApplet}
+
+
+\section{Zuul awesome}
+
+\subsection{Room sides}
+
+\subsection{Quests}
+
+\subsection{Better GUI}
+
+\subsection{Music}
+
+\subsection{Save/load game}
+
+\subsubsection{save}
+
+\subsubsection{load}
+
+\subsection{More tests}
+
+
+\section{Not Zuul}
+
+\subsection{maximum}
+
+\subsection{static}
+
+\subsubsection{Properties}
+
+\subsubsection{numberOfInstances}
+
+\subsection{currentTimeMillis}
diff --git a/report/report.tex b/report/report.tex
deleted file mode 100644
index 7616326..0000000
--- a/report/report.tex
+++ /dev/null
@@ -1,20 +0,0 @@
-\documentclass{memoir}
-