Unless I'm an idiot
Merge branch 'master' of https://github.com/Epiphane/GGJ2014

Conflicts:
	GGJam/src/com/band/ggjam/InGameState.java