Music transition code
Merge branch 'master' of https://github.com/dazedrobot/GGJ14 into jason

Conflicts:
	GGJ14/GGJ14.userprefs