third commit cut short because of some bitch
srgd
nf2
Merge branch 'master' of https://github.com/31062/COMP4Coursework.git

Conflicts:
	Analysis/analysis.tex
	coursework.tex