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

Conflicts:
	GGJ14/GGJ14.userprefs
Merge master into callums
Merge branch 'master' into callums

Conflicts:
	GGJ14/Assets/main.unity
Removed Debug.Logs and built cabin.