Fixed stuff
Merge branch 'master' of github.com:Seich/GAMEON2014

Conflicts:
	source/PlayState.hx