wut
Merge branch 'master' of https://github.com/jpedrorl/CampJam14

Conflicts:
	PlatformPrototype/build/classes/resources/Sprite.class
	PlatformPrototype/build/classes/states/GameStatePrepare.class