Merge branch 'Atlas_3' into Master_2
SnowStar
Merge branch 'Master_2' of https://github.com/HawkDaght/IndieSpeedRun into Master_2

Conflicts:
	Gemini/Gemini-csharp.sln
	Gemini/Gemini.sln
	Gemini/Gemini.userprefs
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/InspectorExpandedItems.asset
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-CSharp.dll
	Gemini/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
Merge branch 'Atlas_3' into Master_2
Merge branch 'Atlas_3' into Master_2
Merge branch 'Atlas_3' into Master_2
Merge branch 'Atlas_3' into Master_2
F5
Merge branch 'Master_2' of https://github.com/HawkDaght/IndieSpeedRun into Master_2
Merge branch 'Master_2' into Zc-Z

Conflicts:
	Gemini/Gemini-csharp.sln
	Gemini/Gemini.sln
	Gemini/Gemini.userprefs
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/EditorUserBuildSettings.asset
	Gemini/Library/InspectorExpandedItems.asset
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-CSharp.dll
	Gemini/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
	Gemini/Library/metadata/05/052164a63d0483f409223136c11d4376
	Gemini/Library/metadata/61/61074613cc5754d778811c701ef6f8bc
	Gemini/Library/metadata/75/75191a23a07e844f3ae5258846e7aca2
	Gemini/Library/metadata/af/afffb2d063d6f4943bfdb30d27d99130
	Gemini/Library/metadata/b6/b63e40487cbc846989d73aeb258e3e32
	Gemini/Library/metadata/f9/f979b2db252204097a7b5c2b1cc74968
	Gemini/ProjectSettings/EditorBuildSettings.asset
Merge branch 'Atlas_3' into Master_2
Merge branch 'Atlas_3' into Master_2
prepare music
Merge branch 'Master_2' of https://github.com/HawkDaght/IndieSpeedRun into Master_2
Merge branch 'Master_2' into Zc-Z

Conflicts:
	Gemini/Gemini-csharp.sln
	Gemini/Gemini.sln
	Gemini/Gemini.userprefs
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-CSharp.dll
	Gemini/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Gemini/Library/assetDatabase3
	Gemini/Library/metadata/b6/b63e40487cbc846989d73aeb258e3e32
Merge branch 'Atlas_3' into Master_2
AudioAdded
Merge branch 'Master_2' of https://github.com/HawkDaght/IndieSpeedRun into Master_2
Merge branch 'Zc-Z' into Master_2

Conflicts:
	Gemini/Gemini-csharp.sln
	Gemini/Gemini.sln
	Gemini/Gemini.userprefs
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/InspectorExpandedItems.asset
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-CSharp.dll
	Gemini/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
	Gemini/Library/metadata/01/01743b39731f94dadad6093db48f66ca
	Gemini/Library/metadata/5b/5bb0eb01e40914cce93711997a69a0c5
	Gemini/Library/metadata/b6/b63e40487cbc846989d73aeb258e3e32
	Gemini/Library/metadata/be/bea14eeaf96314ddb8a3fd96af00935c
	Gemini/Library/metadata/ca/cafe0a741d1554e2e9cd7cd4e95b91e6
	Gemini/Library/metadata/cd/cd592be3f51d71a4f880b01c3c782a9c
	Gemini/Library/metadata/fc/fc37f2544561a495896cdb77209ef4c5
fixed