don't really know what happened in this commit
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	define-game.rkt
	game.rkt
just some cleanup