Yet another test
Merge branch 'master' of https://github.com/DylanSA/CSCAssignment7

Conflicts:
	hello.txt
Sigh