coursework.log
Merge branch 'master' of https://github.com/JoelLongRoad/COMP4Coursework

Conflicts:
	coursework.log