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.fdb_latexmk

@@ -1,5 +1,9 @@
 # Fdb version 3
+<<<<<<< HEAD
 ["latex"] 1429057416 "progress_report.tex" "progress_report.dvi" "progress_report" 1429057422
+=======
+["latex"] 1429044499 "progress_report.tex" "progress_report.dvi" "progress_report" 1429044577
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
   "/usr/local/texlive/2014/texmf-dist/fonts/map/fontname/texfonts.map" 1272929888 3287 e6b82fe08f5336d4d5ebc73fb1152e87 ""
   "/usr/local/texlive/2014/texmf-dist/fonts/tfm/public/cm/cmr10.tfm" 1136768653 1296 45809c5a464d5f32c8f98ba97c1bb47f ""
   "/usr/local/texlive/2014/texmf-dist/fonts/tfm/public/txfonts/txb.tfm" 1136768653 2452 76194099b4f1c022cb59f4564251c4fe ""
@@ -55,6 +59,7 @@
   "/usr/local/texlive/2014/texmf-dist/web2c/texmf.cnf" 1398200874 31722 4f52421e59a4b9e910cf18e64c1f2b4a ""
   "/usr/local/texlive/2014/texmf-var/web2c/pdftex/latex.fmt" 1401025988 3831950 412798929e0196806f9f91e131a01806 ""
   "/usr/local/texlive/2014/texmf.cnf" 1401025936 577 a59edbde8d3a8c549d0eeaab1739e2ff ""
+<<<<<<< HEAD
   "old-gantt.png" 1429057390 101185 f09f139493b49efd4a4a3b3fe455d710 ""
   "progress_report.aux" 1429057422 1054 1fb7c5c88c3fe5c21808963cf33f2978 ""
   "progress_report.out" 1429057422 236 3411de8a1192db7b41eeb11bf4c93fef ""
@@ -66,3 +71,16 @@
   "progress_report.out"
   "progress_report.toc"
   "progress_report.dvi"
+=======
+  "old-gantt.jpg" 1429044440 24493 24188bdf4f5434787c664b216e3898f2 ""
+  "progress_report.aux" 1429044500 1054 1fb7c5c88c3fe5c21808963cf33f2978 ""
+  "progress_report.out" 1429044500 236 3411de8a1192db7b41eeb11bf4c93fef ""
+  "progress_report.tex" 1429044508 7262 ec5dd8aff911c63e55f0b215ebc5fca1 ""
+  "progress_report.toc" 1429044500 0 d41d8cd98f00b204e9800998ecf8427e ""
+  (generated)
+  "progress_report.dvi"
+  "progress_report.out"
+  "progress_report.toc"
+  "progress_report.aux"
+  "progress_report.log"
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9

progress_report/progress_report.fls

@@ -124,5 +124,10 @@ INPUT /usr/local/texlive/2014/texmf-dist/fonts/tfm/public/txfonts/txb.tfm
 INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/omstxr.fd
 INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/omstxr.fd
 INPUT /usr/local/texlive/2014/texmf-dist/fonts/tfm/public/txfonts/txsy.tfm
+<<<<<<< HEAD
 INPUT old-gantt.png
 INPUT old-gantt.png
+=======
+INPUT old-gantt.jpg
+INPUT old-gantt.jpg
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9

progress_report/progress_report.out

@@ -2,6 +2,7 @@
 \BOOKMARK [2][-]{subsection.1.1}{Purpose of the Report}{section.1}% 2
 \BOOKMARK [2][-]{subsection.1.2}{Purpose of the Project}{section.1}% 3
 \BOOKMARK [1][-]{section.2}{Literature Review}{}% 4
+<<<<<<< HEAD
 \BOOKMARK [1][-]{section.3}{Progress}{}% 5
 \BOOKMARK [2][-]{subsection.3.1}{Front End: Status}{section.3}% 6
 \BOOKMARK [2][-]{subsection.3.2}{Front End: Projections}{section.3}% 7
@@ -14,3 +15,5 @@
 \BOOKMARK [2][-]{subsection.4.3}{Future Phases}{section.4}% 14
 \BOOKMARK [2][-]{subsection.4.4}{Redefined Goals}{section.4}% 15
 \BOOKMARK [1][-]{section.5}{Discussion}{}% 16
+=======
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9

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}

progress_report/progress_report.tex.project.vim

@@ -5,7 +5,11 @@ let g:atp_mapNn = 0
 let b:atp_autex = 1
 let b:atp_TexCompiler = 'pdftex'
 let b:atp_TexOptions = '-synctex=1'
+<<<<<<< HEAD
 let b:atp_TexFlavor = 'tex'
+=======
+let b:atp_TexFlavor = 'plaintex'
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
 let b:atp_auruns = '1'
 let b:atp_ReloadOnError = '1'
 let b:atp_OutDir = '/Users/shyam/Dropbox/cdb/progress_report'

progress_report/progress_report_aux

@@ -14,12 +14,20 @@
 \fi}
 \global\let\hyper@last\relax 
 \gdef\HyperFirstAtBeginDocument#1{#1}
+<<<<<<< HEAD
 \providecommand\HyField@AuxAddToFields[1]{}
 \providecommand\HyField@AuxAddToCoFields[2]{}
+=======
+\providecommand*\HyPL@Entry[1]{}
+\HyPL@Entry{0<</S/D>>}
+\HyPL@Entry{1<</S/r>>}
+\HyPL@Entry{2<</S/D>>}
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
 \@writefile{toc}{\contentsline {section}{\numberline {1}Overview}{1}{section.1}}
 \@writefile{toc}{\contentsline {subsection}{\numberline {1.1}Purpose of the Report}{1}{subsection.1.1}}
 \@writefile{toc}{\contentsline {subsection}{\numberline {1.2}Purpose of the Project}{1}{subsection.1.2}}
 \@writefile{toc}{\contentsline {section}{\numberline {2}Literature Review}{1}{section.2}}
+<<<<<<< HEAD
 \@writefile{toc}{\contentsline {section}{\numberline {3}Progress}{2}{section.3}}
 \@writefile{lof}{\contentsline {figure}{\numberline {1}{\ignorespaces Old Project Gantt Chart}}{2}{figure.1}}
 \newlabel{fig:old-gantt}{{1}{2}{Old Project Gantt Chart}{figure.1}{}}
@@ -35,3 +43,5 @@
 \@writefile{toc}{\contentsline {subsection}{\numberline {4.2}New Timeline}{4}{subsection.4.2}}
 \@writefile{toc}{\contentsline {subsection}{\numberline {4.3}Future Phases}{4}{subsection.4.3}}
 \@writefile{toc}{\contentsline {subsection}{\numberline {4.4}Redefined Goals}{4}{subsection.4.4}}
+=======
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9