Minor bug fixes
Merge branch 'master' of github.com:jpedrorl/CampJam14

Conflicts:
	PlatformPrototype/build/classes/code/Interlude.class
	PlatformPrototype/build/classes/states/GameStateGame.class
	PlatformPrototype/build/classes/states/GameStateManager.class