Add Music
Merge branch 'master' of https://github.com/jschavey/thefinalninja

Conflicts:
	thefinalninja.gmx/rooms/room0.room.gmx