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

Conflicts:
	PlatformPrototype/build/classes/states/GameStateGame.class
	PlatformPrototype/nbproject/private/private.xml
	PlatformPrototype/src/states/GameStateGame.java
Merge(2)