Resolved Merge

Doc/TestPlan/TestPlan.tex

@@ -12,15 +12,17 @@
 }
 %\usepackage[round]{natbib}
 
-\title{SE 3XA3: Test Plan\\Title of Project}
-
-\author{Team \#, Team Name
-		\\ Student 1 name and macid
-		\\ Student 2 name and macid
-		\\ Student 3 name and macid
+\title{SE 3XA3: Test Plan\\Rogue Reborn}
+
+\author{Team \#6, Team Rogue++\\\\
+	\begin{tabular} {l r}
+		Ian Prins & prinsij \\
+		Mikhail Andrenkov & andrem5 \\
+		Or Almog  & almogo
+	\end{tabular}
 }
 
-\date{\today}
+\date{Due Monday, October 31\textsuperscript{th}, 2016}
 
 \input{../Comments}
 
@@ -38,8 +40,7 @@
 \begin{tabularx}{\textwidth}{p{3cm}p{2cm}X}
 \toprule {\bf Date} & {\bf Version} & {\bf Notes}\\
 \midrule
-Date 1 & 1.0 & Notes\\
-Date 2 & 1.1 & Notes\\
+10/21/16 & 0.1 & Initial Setup\\
 \bottomrule
 \end{tabularx}
 \end{table}
@@ -246,4 +247,4 @@ Their values are defined in this section for easy maintenance.
 
 This is a section that would be appropriate for some teams.
 
-\end{document}
\ No newline at end of file
+\end{document}