Moving blocks!
Merge branch 'master' of github.com:Jesse-calkin/GGJ2014

Conflicts:
	classes/platformer/game.py