Level3Feature
F5
Merge branch 'Zc-Z' into Master_2

Conflicts:
	Gemini/Assets/Nick Scene/NickMarch&April/TestAI.unity
	Gemini/Assets/Script/NickNew/BlackFadeFollow.cs
	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/2c/2caad70492bff2b43b17d54c51fa8b1a
	Gemini/Library/metadata/6a/6accc1e869257ed4188aeeafc02b2629
	Gemini/Library/metadata/7f/7f5f9e26b24845f40b4ced41255bfc68
	Gemini/Library/metadata/cd/cd592be3f51d71a4f880b01c3c782a9c
FixControl
Level3Background
Merge branch 'Master_2' of https://github.com/HawkDaght/IndieSpeedRun into Master_2

Conflicts:
	Gemini/Assets/Script/Character/CharacterManager.cs
	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/19/19203e06ddfcf48e7ac28c144515fdc8
	Gemini/Library/metadata/1a/1ace5b21a884d4cd0a4b53deb573428a
	Gemini/Library/metadata/64/64d7ef258a5964fb79c995a82a23700f
	Gemini/Library/metadata/65/6562e3dadb27548a7b8291af26467b56
	Gemini/Library/metadata/6c/6c32f0e4e4b4940c683878a72e0a0913
	Gemini/Library/metadata/70/708dc38968fdb42bbadfdf98380efc2e
	Gemini/Library/metadata/78/78cbed97f93da46dfa45ab4b79f76f90
	Gemini/Library/metadata/93/93ef057dadc13473ca2f5af5dd6ab9ae
	Gemini/Library/metadata/b0/b038a2006d5d14fad98dbc2156674999
	Gemini/Library/metadata/b2/b2305f2d17baa429b883cf9f740dbcbf
	Gemini/Library/metadata/b6/b63e40487cbc846989d73aeb258e3e32
	Gemini/Library/metadata/be/beda91161ca094ab8a5a5390a3ef05f7
	Gemini/Library/metadata/cd/cd592be3f51d71a4f880b01c3c782a9c
	Gemini/Library/metadata/cf/cf0498dba9adf430a943b5454e523869
	Gemini/Library/metadata/cf/cfd29d3c525134215b3f4bd369c884b1
	Gemini/Library/metadata/dd/dd2a3b2e3da8b4575ad542e01f41fa29
	Gemini/Library/metadata/f0/f06b9ff9fe5dd479491638afdfab8104
	Gemini/Library/metadata/f5/f5ec8c70fcda24fbd8bf0397e147f227
Merge branch 'Master_2' into Atlas_3