Merge branch 'master' of github.com:dopefishh/des2015

diff --combined marsrover/document/dev.tex
index 7baf12b,de5004d..121c214
--- 1/marsrover/document/dev.tex
--- 2/marsrover/document/dev.tex
+++ b/marsrover/document/dev.tex
@@@ -5,7 -5,7 +5,7 @@@ iterations will have an implementation 
  phase, and a design phase. Furthermore, each of the iterations will have goals
  and results. The iterations are listed in \autoref{tab:devit}
  
 -\begin{table}[h]
 +\begin{table}[h!]
        \centering
        \begin{tabu} to \linewidth{lX}
                \toprule
@@@ -46,3 -46,18 +46,18 @@@
        \end{tabu}
        \caption{Spiral model iterations}\label{tab:devit}
  \end{table}
+ 
+ The deadline of the iterations are listed in \autoref{tab:deadli}
+ \begin{table}
+       \begin{tabu} to \linewidth{lX}
+               \hline
+               Deadline & Iterations\\
+               \hline
+               9 Dec 2015 & Iteration 1 - 6\\
+               16 Dec 2015 & Iteration 7 - 10\\
+               23 Dec 2015 & Iteration 11 - 13\\
+               6 Jan 2016 & Iteration 14 - 16\\
+               \hline
+       \end{tabu}
+       \caption{Deadlines}\label{tab:deadli}
+ \end{table}