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
Merge branch 'Atlas_3' into Master_2
Merge branch 'Atlas_3' into Master_2
Merge branch 'Atlas_3' into Master_2
Rebirth
Merge branch 'Zc-Z' into Master_2

Conflicts:
	Gemini/Assets/3D Model.meta
	Gemini/Assets/3D Model/Materials.meta
	Gemini/Assets/3D Model/Materials/pTorus1Mat.mat
	Gemini/Assets/3D Model/Materials/pTorus1Mat.mat.meta
	Gemini/Assets/Material/Abstract/Materials/New Material.mat
	Gemini/Assets/Material/Abstract/Materials/New Material.mat.meta
	Gemini/Assets/Material/Abstract/Star_Circle.png.meta
	Gemini/Assets/Material/Abstract/TrailGreen.mat
	Gemini/Assets/Material/Abstract/TrailGreen.mat.meta
	Gemini/Assets/Material/ConstellationPuzzle/WhiteSquare_Small.png.meta
	Gemini/Assets/Material/GUI/Keyboard Arrow 2.psd.meta
	Gemini/Assets/New Art/Decoration/D_A.png.meta
	Gemini/Assets/New Art/Decoration/D_B.png.meta
	Gemini/Assets/New Art/Materials/symbol.mat
	Gemini/Assets/New Art/Materials/symbol.mat.meta
	Gemini/Assets/New Art/Test/Materials/Materials/Sprite_SoftAdditive.mat
	Gemini/Assets/New Art/Test/Materials/Materials/Sprite_SoftAdditive.mat.meta
	Gemini/Assets/Prefab/Char/fallingGeminiMeteor.prefab
	Gemini/Assets/Prefab/Stars/RiseActivateStar.prefab
	Gemini/Assets/Script/Character/CharControl.cs
	Gemini/Assets/Script/Character/CharControl.cs.meta
	Gemini/Assets/Script/Character/CharControl_Nov22Copy.cs
	Gemini/Assets/Script/Character/CharControl_Nov22Copy.cs.meta
	Gemini/Assets/Script/Character/CharControl_upanddown.cs
	Gemini/Assets/Script/Character/CharControl_upanddown.cs.meta
	Gemini/Assets/Script/Character/CharControl_upanddown2.cs
	Gemini/Assets/Script/Character/CharControl_upanddown2.cs.meta
	Gemini/Assets/Script/Character/CharControl_upanddown2_lightdown.cs
	Gemini/Assets/Script/Character/CharControl_upanddown2_lightdown.cs.meta
	Gemini/Assets/Script/Character/CharMove.cs
	Gemini/Assets/Script/Character/CharMove.cs.meta
	Gemini/Assets/Script/CheckPoint/Old/FloatingCheckPoint.cs
	Gemini/Assets/Script/CheckPoint/Old/FloatingCheckPoint.cs.meta
	Gemini/Assets/Script/CheckPoint/Old/constellationCheckpoint.cs
	Gemini/Assets/Script/CheckPoint/Old/constellationCheckpoint.cs.meta
	Gemini/Assets/Script/NickNew/ActivateArchitec.cs
	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/01/01743b39731f94dadad6093db48f66ca
	Gemini/Library/metadata/19/19203e06ddfcf48e7ac28c144515fdc8
	Gemini/Library/metadata/1d/1d6e2673bdf774e0a99e9187ee84b54f
	Gemini/Library/metadata/26/268d754e6185945a2a4b3ae310660f1f
	Gemini/Library/metadata/27/271ffecee1f30416d96b0994aa9ab0e2
	Gemini/Library/metadata/2b/2b7f8020b800540b39b8e42bf218b6b7
	Gemini/Library/metadata/2c/2c08a104c47bd400f80a17bfc42456fd
	Gemini/Library/metadata/2c/2caad70492bff2b43b17d54c51fa8b1a
	Gemini/Library/metadata/33/337befd4233804865a057bc531356840
	Gemini/Library/metadata/36/36353b1e3515cf54aa56170c68ed3d0f
	Gemini/Library/metadata/3a/3ac6e32f84fce42b2aeb1ba18a2edf9d
	Gemini/Library/metadata/3f/3f36b2222adeb4dd1b670900d29d4663
	Gemini/Library/metadata/48/48da89b296520534eb52aa193ecdc7db
	Gemini/Library/metadata/4f/4f299920cd168fb4c90d5eea236dfb3c
	Gemini/Library/metadata/52/524ea9bb68fb0447fa37a5950535548a
	Gemini/Library/metadata/60/608bbd4718334440c88ae272fd1dc6e3
	Gemini/Library/metadata/64/64d7ef258a5964fb79c995a82a23700f
	Gemini/Library/metadata/65/6562e3dadb27548a7b8291af26467b56
	Gemini/Library/metadata/65/65d7195321e88df408a97c2d88d319df
	Gemini/Library/metadata/68/6877d0535f28b42ebae2dc6206ccc226
	Gemini/Library/metadata/74/7413c3fca6e5040d09ae08ca7ec9012b
	Gemini/Library/metadata/78/78cbed97f93da46dfa45ab4b79f76f90
	Gemini/Library/metadata/86/8643052279ba6b54c917c0f5335f25d6
	Gemini/Library/metadata/89/89605b26e2e6e477d8240508b6d9232a
	Gemini/Library/metadata/8d/8d4ed36bb7ab30945abc046b471e1d41
	Gemini/Library/metadata/8d/8d9baa39d909c49d09462d9dcec9123b
	Gemini/Library/metadata/92/924053002a75e42078e8854d89e67cef
	Gemini/Library/metadata/97/97e0447789e197242a6aedda41412703
	Gemini/Library/metadata/99/9916355507b6c4917a26684c3a0bca61
	Gemini/Library/metadata/9f/9f5cfe4eaa15e4e26ba60bc1c7357251
	Gemini/Library/metadata/a8/a89729a0f72ae4f9a9fd3a814ae38017
	Gemini/Library/metadata/aa/aa168066c46dc47a6965dd3d295c6271
	Gemini/Library/metadata/ab/ab8f19487ef7abe40af86f47beebd5ab
	Gemini/Library/metadata/af/afffb2d063d6f4943bfdb30d27d99130
	Gemini/Library/metadata/b0/b038a2006d5d14fad98dbc2156674999
	Gemini/Library/metadata/c1/c1378ce0c20b547358609c12ea8f1935
	Gemini/Library/metadata/c7/c7bbddfe81ae5422c80710ee0c3f5585
	Gemini/Library/metadata/ca/cafe0a741d1554e2e9cd7cd4e95b91e6
	Gemini/Library/metadata/cd/cd41b2432203a4bd1862b31036626ab8
	Gemini/Library/metadata/cd/cd592be3f51d71a4f880b01c3c782a9c
	Gemini/Library/metadata/ce/cee94ecaf4a4747dcbecf3e0efb4f107
	Gemini/Library/metadata/cf/cfd29d3c525134215b3f4bd369c884b1
	Gemini/Library/metadata/d3/d3530a52dd11645d183be0dcb7f1c7f3
	Gemini/Library/metadata/d7/d7410bec143664309941a20563cce0e4
	Gemini/Library/metadata/de/de234d48d9c624b4ab0da38db7e615c9
	Gemini/Library/metadata/df/dfaf80793484d3b4b85c56e1462f4cfd
	Gemini/Library/metadata/e7/e7520600ebcc54e368ada57e3f30663c
	Gemini/Library/metadata/ea/ea6af6a2ae09e48e897a609ee69e7213
	Gemini/Library/metadata/f0/f06b9ff9fe5dd479491638afdfab8104
	Gemini/Library/metadata/f4/f42013bcca6624b72b230acf36d14b9a
	Gemini/Library/metadata/f5/f5ec8c70fcda24fbd8bf0397e147f227
	Gemini/Library/metadata/ff/ff485ad47adda4cd88a81cdffb223fe3
f5
f5
Rebirth Again
f5
Merge branch 'Zc-Z' into Master_2

Conflicts:
	Gemini/Assets/New Art/Character/Version_1/StarCore.png
	Gemini/Assets/New Art/Character/Version_1/StarShape.png
	Gemini/Assets/New Art/Character/Version_1/StarSkeleton_1.png
	Gemini/Assets/New Art/Character/Version_1/StarSkeleton_2.png
	Gemini/Assets/New Art/Character/Version_1/StarSkeleton_3.png
	Gemini/Assets/New Art/Character/Version_1/StarSkeleton_4.png
	Gemini/Assets/New Art/Character/Version_1/StarSkeleton_5.png
	Gemini/Assets/New Art/Character/Version_1/StarSkeleton_Final.png
	Gemini/Assets/Nick Scene/NickMarch&April/ForIncubator.unity
	Gemini/Gemini-csharp.sln
	Gemini/Gemini.sln
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/assetDatabase3
	Gemini/Library/metadata/02/029d5b016fecfc04fb877a0ca575d0f9
	Gemini/Library/metadata/05/052164a63d0483f409223136c11d4376
	Gemini/Library/metadata/0e/0ebeffab1f9f747048858de8d4026c93
	Gemini/Library/metadata/39/392ebf2cceba14ee1a997045380d8db2
	Gemini/Library/metadata/41/41e86413e71804d66851daa0db071da3
	Gemini/Library/metadata/54/54fb2c4145d1d402fac98c7f4dbb6e97
	Gemini/Library/metadata/63/63a22a863917740989abc9f7193cd607
	Gemini/Library/metadata/93/93dbedcca95bc44029adba6edbd0aff2
	Gemini/Library/metadata/af/af750f2dd0d76a6429b9e5d8fdf7d411
	Gemini/Library/metadata/f6/f63cdd21ad9c88847b1ed2a364559fe8
	Gemini/Library/metadata/f9/f90e8ad5be475ab4ab2b467abea19417
f5
Merge branch 'Atlas_3' into Master_2
refresh
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/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/10/102554a6fe999436cb9354ad98f121c9
	Gemini/Library/metadata/5e/5e2ea97a1d0114f0ab584136f480f233
	Gemini/Library/metadata/65/6562e3dadb27548a7b8291af26467b56
	Gemini/Library/metadata/b0/b038a2006d5d14fad98dbc2156674999
	Gemini/Library/metadata/b6/b63e40487cbc846989d73aeb258e3e32
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/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/97/97e0447789e197242a6aedda41412703
MergeLevel