update
Merge branch 'master' of https://github.com/PetersBrice/Game_Project

Conflicts:
	test.txt
Merge branch 'master' of https://github.com/PetersBrice/Game_Project

Conflicts:
	test.txt
New way to use file