School 03/12/14
Merge branch 'master' of
https://github.com/HisRoyalFreshness/COMP4Coursework.git

Conflicts:
	Analysis/analysis.log
	Analysis/analysis.tex
	Design/design.tex