Merge branch 'master' of https://github.com/Emetico/MyGame_Master

Conflicts:
	.gitignore