Merge branch 'master' of https://github.com/blinktenor/Game

Conflicts:
	.gitignore