Merge branch 'master' of github:szmoore/MCTX3420

Conflicts:
	reports/final/chapters/Results.tex

Stupidly I used slightly different label names for the sections than their section names -_-

diff --combined reports/final/chapters/Results.tex
index b54e68d,57da4e0..cc314a2
--- 1/reports/final/chapters/Results.tex
--- 2/reports/final/chapters/Results.tex
+++ b/reports/final/chapters/Results.tex
@@@ -4,18 -4,17 +4,18 @@@ This report has described the work of t
  In summary, we have succeeded in the following goals:
  
  \begin{enumerate}
 -      \item Design and implementation of a multi-threaded process for providing continuous control over real hardware in response to intermittent user actions (Section \ref{Server Program}, \ref{Hardware Interfacing})
 -      \item Design and implementation of a configuration allowing this process to interface with the \emph{nginx} HTTP server (Sections \ref{Communications}, \ref{Server Configuration}
 +      \item Design and implementation of a multithreaded process for providing continuous control over real hardware in response to intermittent user actions (Section \ref{Server Program}, \ref{Hardware})
 +      \item Design and implementation of a configuration allowing this process to interface with the \emph{nginx} HTTP server (Sections \ref{Communications}, \ref{Configuration}
        \item Design and implementation of a API using the HTTP protocol to allow a client process to supply user commands to the system (Section \ref{Communications})
        \item Design and implementation of the client process using a web browser based GUI that requires no additional software to be installed on the client PC (Section \ref{Communications}, \ref{GUI})
        \item Design and implementation of several alternative authentication mechanisms for the system which can be integrated with different user management solutions (Section \ref{Authentication})
 +      \item Design and implementation of image streaming and image processing for use with a dilatometer (Section \ref{Image Processing})
        \item Partial design and implementation of a system for managing the datafiles of different users (Section \ref{API})
        \item Partial design and implementation of a user management system in PHP based upon UserCake (Sections \ref{Authentication}, \ref{Cookies})
        \item Integration and partial testing of the software with the overall MCTX3420 2013 Exploding Cans project (All sections)
  \end{enumerate}
  
- We make the following general recommendations for further development of the system software (with more specific recomendations discussed in the relevant setions):
+ We make the following general recommendations for further development of the system software (with more specific recommendations discussed in the relevant sections):
  \begin{enumerate}
        \item That the current software is built upon, rather than redesigned from scratch. The software can be adapted to run on a Raspberry Pi, or even a GNU/Linux laptop if required.
        \item That more detailed testing and debugging of several aspects of the software are required; in particular:
@@@ -30,8 -29,8 +30,8 @@@
  
  We would also like to make the following recommendations with regard to system hardware:
  \begin{enumerate}
-       \item Care is given to protecting the BeagleBone from electrical faults (eg: overloading or underloading the ADC/GPIO pins, a power surge overloading the supply voltage)
-       \item A mechanism (possibly employing a high value capacator) is included to allow a loss of power to be detected and the BeagleBone shut down safely
+       \item Care is given to protecting the BeagleBone from electrical faults (e.g.: overloading or underloading the ADC/GPIO pins, a power surge overloading the supply voltage)
+       \item A mechanism (possibly employing a high value capacitor) is included to allow a loss of power to be detected and the BeagleBone shut down safely
  \end{enumerate}