Merge branch 'master' into Atlas_2
some tiny changes
Merge branch 'Atlas_2'

Conflicts:
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
ok
Merge branch 'master' into Atlas_2
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun

Conflicts:
	Gemini/Library/InspectorExpandedItems.asset
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
Falling star + level Gating
Level_test complete
small changes
Merge branch 'Atlas_2'

Conflicts:
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
tweak
Merge branch 'master' into Atlas_2
hkg
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Assets/AtlasScene/Atlas_IGF_2.unity
	Gemini/Assets/Prefab/FallenStar.prefab
	Gemini/Assets/Prefab/FallingStar.prefab
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
level designing
Merge branch 'Atlas_2'
sync
ok
123
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Assets/AtlasScene/Atlas_IGF_2.unity
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper