thursday night commit
Merge branch 'master' of https://github.com/JonathanHolland/COMP3702

Conflicts:
	.gitignore