snowy cloud
Merge branch 'Atlas_2'

Conflicts:
	Gemini/Assets/AtlasScene/Atlas_IGF.unity
	Gemini/Assets/Material/Building.mat
	Gemini/Library/ScriptMapper
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun

Conflicts:
	Gemini/Assets/AtlasScene/Atlas_IGF.unity
	Gemini/Assets/Material/Building.mat
	Gemini/Library/ScriptMapper
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper