Merge branch 'Atlas_3' into Master_2
Merge branch 'Atlas_3' into Master_2
Level3Complete
Merge branch 'Zc-Z' into Master_2

Conflicts:
	Gemini/Gemini-csharp.sln
	Gemini/Gemini.sln
	Gemini/Gemini.userprefs
	Gemini/Library/CurrentLayout.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/expandedItems
	Gemini/Library/guidmapper
	Gemini/Library/metadata/b6/b63e40487cbc846989d73aeb258e3e32
	Gemini/Library/metadata/cd/cd592be3f51d71a4f880b01c3c782a9c
f5
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/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
	Gemini/Library/metadata/af/afffb2d063d6f4943bfdb30d27d99130
	Gemini/Library/metadata/b6/b63e40487cbc846989d73aeb258e3e32
	Gemini/Library/metadata/cd/cd592be3f51d71a4f880b01c3c782a9c
f5
Merge branch 'Atlas_3' into Master_2
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/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/expandedItems
	Gemini/Library/guidmapper
	Gemini/Library/metadata/55/55ffccc1920624c9786e388229f98699
	Gemini/Library/metadata/61/61074613cc5754d778811c701ef6f8bc
	Gemini/Library/metadata/65/6562e3dadb27548a7b8291af26467b56
	Gemini/Library/metadata/9c/9c8c935a6a96e41f1a947754ed971de9
	Gemini/Library/metadata/b0/b038a2006d5d14fad98dbc2156674999
	Gemini/Library/metadata/b6/b63e40487cbc846989d73aeb258e3e32
F5
Merge branch 'Atlas_3' into Master_2

Conflicts:
	Gemini/Gemini.userprefs
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/assetDatabase3
d
Merge branch 'Master_2' into Atlas_3