Merge branch 'Atlas_3'
Merge branch 'Atlas_3'
Merge branch 'Atlas_3'
Merge branch 'Atlas_3'
Merge branch 'Atlas_3'
123
12
Merge branch 'Zc-Z'

Conflicts:
	Gemini/Assets/Script/NickNew/LightHouse.cs
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/InspectorExpandedItems.asset
	Gemini/Library/assetDatabase3
NickNew1.unity
lighthouselevel
Merge branch 'Atlas_3'
123
Merge branch 'Zc-Z'

Conflicts:
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/assetDatabase3
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun

Conflicts:
	Gemini/Library/assetDatabase3
Merge branch 'Atlas_3'

Conflicts:
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/EditorUserBuildSettings.asset
?
.
refresh
Merge branch 'master' into Atlas_3