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

Conflicts:
	Gemini/Assembly-CSharp-Editor-vs.csproj
	Gemini/Assembly-CSharp-Editor.csproj
	Gemini/Assembly-CSharp-firstpass-vs.csproj
	Gemini/Assembly-CSharp-firstpass.csproj
	Gemini/Assembly-CSharp-vs.csproj
	Gemini/Assembly-CSharp.csproj
	Gemini/Assembly-UnityScript-Editor-vs.unityproj
	Gemini/Assembly-UnityScript-Editor.unityproj
	Gemini/Assembly-UnityScript-firstpass-vs.unityproj
	Gemini/Assembly-UnityScript-firstpass.unityproj
	Gemini/Gemini-csharp.sln
	Gemini/Gemini.sln
	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
Merge branch 'Atlas_3' into Master_2
fix sound burst
Merge branch 'Master_2' of https://github.com/HawkDaght/IndieSpeedRun into Master_2

Conflicts:
	Gemini/Assembly-CSharp-Editor-vs.csproj
	Gemini/Assembly-CSharp-Editor.csproj
	Gemini/Assembly-CSharp-firstpass-vs.csproj
	Gemini/Assembly-CSharp-firstpass.csproj
	Gemini/Assembly-CSharp-vs.csproj
	Gemini/Assembly-CSharp.csproj
	Gemini/Assembly-UnityScript-Editor-vs.unityproj
	Gemini/Assembly-UnityScript-Editor.unityproj
	Gemini/Assembly-UnityScript-firstpass-vs.unityproj
	Gemini/Assembly-UnityScript-firstpass.unityproj
	Gemini/Gemini-csharp.sln
	Gemini/Gemini.sln
	Gemini/Gemini.userprefs
	Gemini/Library/CurrentLayout.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/guidmapper
	Gemini/Library/metadata/01/01743b39731f94dadad6093db48f66ca
	Gemini/Library/metadata/5e/5ec8fea1c1bf54f5ebd243e0d3df51bd
	Gemini/Library/metadata/b6/b63e40487cbc846989d73aeb258e3e32
fix sound
Merge branch 'Atlas_3' into Master_2

Conflicts:
	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.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/metadata/18/1835f69f979e4473f8c42ca10c11d25a
	Gemini/Library/metadata/b6/b63e40487cbc846989d73aeb258e3e32
Merge branch 'Master_2' into Atlas_3