trying to resolve some problem with git
Merge branch 'master' of https://github.com/Manwe23/TheGame

Conflicts:
	TheGame.exe