Merge branch 'shyam_raghavan' of github.com:aarongut/cdb into shyam_raghavan

Conflicts:
	progress_report/progress_report.dvi
	progress_report/progress_report.fdb_latexmk
	progress_report/progress_report.fls
	progress_report/progress_report.out
	progress_report/progress_report.pdf
	progress_report/progress_report.tex
	progress_report/progress_report.tex.project.vim
	progress_report/progress_report_aux

progress_report/progress_report.tex

@@ -125,6 +125,7 @@ causing problems later down the line. If we only found these bugs by using
 the frontend, they would have been much harder to debug, as there would have
 been much more code to work through.
 \section{Progress}
+<<<<<<< HEAD
 \begin{figure}[h]
   \centering
   \includegraphics[width=\linewidth]{old-gantt.png}
@@ -182,6 +183,28 @@ categories have been redefined. These changes can be identified in the above
 Gantt charts by in shifts in the bars of the Gantt chart. The development bars
 have increased in relative size while the testing and revising bars have shrunk.
 \subsection{New Timeline}
+=======
+\section{Recommendations}
+\begin{figure}[h]
+  \centering
+  \includegraphics[width=\linewidth]{old-gantt.jpg}
+  \caption{Old Project Gantt Chart}
+  \label{fig:old-gantt}
+\end{figure}
+\begin{figure}[h]
+  \centering
+  \includegraphics[width=\linewidth]{new-gantt.jpg}
+  \caption{New Project Gantt Chart}
+  \label{fig:new-gantt}
+\end{figure}
+There are three major changes to the project plan: the frontend and backend
+deadlines have moved back several days, the user testing and revisions period
+have shifted back accordingly and have shortened, the frontend goal categories
+have been redefined. These changes can be identified in the above Gantt charts
+by in shifts in the bars of the Gantt chart. The development bars have
+increased in relative size while the testing and revising bars have shrunk.
+\par
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
 The frontend and backend periods needed to shift backwards simply due to the
 group’s initial underestimation of the amount of time required to create a
 reasonable product. The team believes additional development time on the
@@ -191,7 +214,11 @@ Without this pushback the team currently has a working prototype with a basic
 user interface and native function calls implemented, but the project has yet
 to include several important features considered necessary for useful
 application by students.
+<<<<<<< HEAD
 \subsection{Future Phases}
+=======
+\par
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
 The user testing and adjustments periods have shrunk due to the increased
 development time. The team decided to avoid user testing and adjustments during
 the main development phase, but due to the time pressure this caused the
@@ -199,7 +226,11 @@ testing and adjustment phases to shrink by several days each and overlap
 significantly. The team hopes to consistently implement changes as students
 provide feedback so that the overlap still provides time to implement
 suggestions.
+<<<<<<< HEAD
 \subsection{Redefined Goals}
+=======
+\par
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
 The redefined goals within the frontend category reflect altered priorities of
 the project as a whole. Rather than having the project work to explain topics
 to the user, the project will be designed to simply run user code and step
@@ -211,6 +242,7 @@ team to focus more on providing user interface features which will more
 directly aid in student code development. These features include code stepping
 and highlighting as well as annotated bytecode as listed in the Gantt chart
 above.
+<<<<<<< HEAD
 \section{Discussion}
 These changes provide for a more accurate description of the timeline and the
 remaining work to be accomplished before the deatline. The team believes that
@@ -222,4 +254,6 @@ of the product team has changed to avoid user testing and adjustments during
 the development phase and consistently implement changes as students provide
 feedback. In the long run, the team believes that we will accomplish the final
 product in the timeline specified.
+=======
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
 \end{document}