Some more work on level_1
Merge branch 'master' of https://github.com/ninjaDanzer/FakeWhaleTest

Conflicts:
	PlxBossjam2014.gmx/rooms/Level_1.room.gmx