s
Merge branch 'master' of https://github.com/scuellar/COS424

Conflicts:
	report/Report.tex