Bugfix
Bugfix
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/game1.py
Bugfix