12
12
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Assets/Material/Materials/yellow.mat
	Gemini/Assets/Nick Scene/Nick_contellationpuzzle.unity
	Gemini/Assets/Prefab/window1.prefab
	Gemini/Assets/Script/Nick/HintCollect.cs
	Gemini/Assets/Script/Nick/LightWindow.cs
	Gemini/Library/InspectorExpandedItems.asset
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
123
Merge branch 'Atlas_2'

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