Merge branch 'master' into Atlas_2
some tweak
Merge branch 'Atlas_2'

Conflicts:
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
k
Merge branch 'master' into Atlas_2

Conflicts:
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
Change According to Playtest
merge
12
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun

Conflicts:
	Gemini/Assets/Material/Building.mat
	Gemini/Assets/Nick Scene/NickIGF5.unity
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
constellation
Merge branch 'Atlas_2'
ASD
more responsive control + clearer level gating
Merge branch 'Atlas_2'
fgjh
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun

Conflicts:
	Gemini/Assets/Material/Building.mat
	Gemini/Assets/Script/Nick/audioManager.cs
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Assets/Script/Nick/audioManager.cs
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
12
commit fresh
Merge branch 'Atlas_2'