p0.1.2
Merge branch 'master' of https://github.com/alveretzu/Game-1

Conflicts:
	Game-1.py