made a change
Merge branch 'master' of https://github.com/NicholasSeward/game-design-seward

Conflicts:
	hello.txt