Merge branch 'Atlas_4' into Master_2
Merge branch 'Atlas_4' into Master_2
Tower Rising
Merge branch 'Zc-Z' into Master_2

Conflicts:
	Gemini/Gemini.userprefs
	Gemini/Library/InspectorExpandedItems.asset
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Gemini/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Gemini/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Gemini/Library/metadata/02/029d5b016fecfc04fb877a0ca575d0f9
	Gemini/Library/metadata/13/13e1e98a503ac4096ba2a93b51581b7f
	Gemini/Library/metadata/1c/1cc4753a2c6e84f6bb82b9d0393f896b
	Gemini/Library/metadata/29/2958f1279f2a24213bfe06d446ba2441
	Gemini/Library/metadata/2a/2a11435c188602c4bbc42d6c0f26190f
	Gemini/Library/metadata/2c/2c08a104c47bd400f80a17bfc42456fd
	Gemini/Library/metadata/3a/3ac6e32f84fce42b2aeb1ba18a2edf9d
	Gemini/Library/metadata/47/477855700e12c4854a1dba34c8e49758
	Gemini/Library/metadata/47/4782a2a99fed3423ab6d40f1cc77c683
	Gemini/Library/metadata/49/49d477e8cc1f54a82980a195fcae5eea
	Gemini/Library/metadata/4f/4f299920cd168fb4c90d5eea236dfb3c
	Gemini/Library/metadata/4f/4f40a5badd0a7af40b46c6d030e5ae09
	Gemini/Library/metadata/5a/5a10675a38b044a19aed80f8b8244ebb
	Gemini/Library/metadata/5b/5bb0eb01e40914cce93711997a69a0c5
	Gemini/Library/metadata/63/63a22a863917740989abc9f7193cd607
	Gemini/Library/metadata/66/6679d9f5d8efc4f4cb81a730f5cddccf
	Gemini/Library/metadata/6c/6c1b646fb2cdc4a13b6581c495331af2
	Gemini/Library/metadata/6c/6c7d00293398aa546b4f209dd13ff537
	Gemini/Library/metadata/78/78cbed97f93da46dfa45ab4b79f76f90
	Gemini/Library/metadata/86/8643052279ba6b54c917c0f5335f25d6
	Gemini/Library/metadata/8d/8d4ed36bb7ab30945abc046b471e1d41
	Gemini/Library/metadata/97/97135a3590bf8cf449186ae520bd2adc
	Gemini/Library/metadata/9a/9af82933de51f47749f8e818cebb345a
	Gemini/Library/metadata/9f/9f71a1b9ecfbde749b7b1cf1c5104042
	Gemini/Library/metadata/a8/a89729a0f72ae4f9a9fd3a814ae38017
	Gemini/Library/metadata/aa/aa168066c46dc47a6965dd3d295c6271
	Gemini/Library/metadata/af/af750f2dd0d76a6429b9e5d8fdf7d411
	Gemini/Library/metadata/b1/b1a791cdad4cc4c3fa76ac1af13232bf
	Gemini/Library/metadata/ba/bac668b6bfde44bf6a3d07b6ac69b92e
	Gemini/Library/metadata/c1/c1378ce0c20b547358609c12ea8f1935
	Gemini/Library/metadata/c7/c7bbddfe81ae5422c80710ee0c3f5585
	Gemini/Library/metadata/ce/cee94ecaf4a4747dcbecf3e0efb4f107
	Gemini/Library/metadata/cf/cfd29d3c525134215b3f4bd369c884b1
	Gemini/Library/metadata/e4/e45d5402a34fa471ea70c163b8464855
	Gemini/Library/metadata/e7/e7520600ebcc54e368ada57e3f30663c
	Gemini/Library/metadata/ea/ea6af6a2ae09e48e897a609ee69e7213
	Gemini/Library/metadata/ef/ef79a3d18a08c408fb476c637b2c5985
	Gemini/Library/metadata/fb/fb00234d16b244545982eacb2eaf0469
	Gemini/Library/metadata/fb/fb35b35e361e645438567ce8cfb5c651
	Gemini/Library/metadata/fe/fee640b37c1db4f9dae403ada8576f8a
Merge branch 'Master_2' of https://github.com/HawkDaght/IndieSpeedRun into Master_2

Conflicts:
	Gemini/Assets/Nick Scene/NickMarch&April/NickTestEnding.unity
	Gemini/Assets/Prefab/Environment/Cloud_Nebula.prefab
	Gemini/Assets/Prefab/Environment/Cloud_Nebula.prefab.meta
	Gemini/Assets/Prefab/Environment/Cloud_Nebula_Blue.prefab
	Gemini/Assets/Prefab/Environment/Cloud_Nebula_Red.prefab.meta
	Gemini/Assets/Script/NickNew/Prefab/Environment/Cloud_Nebula.prefab
	Gemini/Assets/Script/NickNew/Prefab/Environment/Cloud_Nebula.prefab.meta
	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-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/c1/c124fa38e2dee4768b6ce83f6b1e9059
Transformer!
Merge branch 'Atlas_4' 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/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/c7/c7bc1573780854384a03b93c0debada8
merge
dd
Merge branch 'Master_2' into Atlas_4