123
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun

Conflicts:
	Gemini/Assets/Nick Scene/Nick_contellationpuzzle2.unity
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/assetDatabase3
12
Merge branch 'Atlas_3'

Conflicts:
	Gemini/Assets/AtlasScene/Atlas_TowerPrototype.unity
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
123
12
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun
Merge branch 'master' into Atlas_3