Update 12/7

-(rough) ingame menu added!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Star Crossing/Assets/Scenes/SongScene01.unity
	Star Crossing/Library/CurrentLayout.dwlt
	Star Crossing/Library/CurrentMaximizeLayout.dwlt
	Star Crossing/Library/InspectorExpandedItems.asset
	Star Crossing/Library/ScriptAssemblies/Assembly-CSharp.dll
	Star Crossing/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Star Crossing/Library/assetDatabase3
	Star Crossing/Library/expandedItems
	Star Crossing/Library/guidmapper
	Star Crossing/Library/metadata/28/282b03e267b45934e8ab102cdfe28901
	Star Crossing/Library/metadata/bd/bd01225b9c5b55e46859607c9d4ef459
	Star Crossing/Star Crossing.userprefs