19/11/14 pt1
Merge branch 'master' of https://github.com/24697/COMP4Coursework.git

Conflicts:
	Design/design.tex