some changes
Merge branch 'master' of https://github.com/dimitrip88/Hello-World

Conflicts:
	game.txt