recommit
Merge branch 'master' of https://github.com/brandonhsiao/rgkit

Conflicts:
	game.py