Try commit

Fail?
Merge branch 'master' of https://github.com/ninjaDanzer/FakeWhaleTest

Conflicts:
	PlxBossjam2014.gmx/PlxBossjam2014.project.gmx
	PlxBossjam2014.gmx/objects/Playerobject.object.gmx
	PlxBossjam2014.gmx/rooms/room0.room.gmx