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

Conflicts:
	Gemini/Assets/Material/water.mat
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
Merge branch 'Atlas_3' into Master_2
test art
Merge branch 'Master_2' of https://github.com/HawkDaght/IndieSpeedRun into Master_2

Conflicts:
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
f5
Merge branch 'Atlas_3' into Master_2
NewLevels
Merge branch 'Master_2' of https://github.com/HawkDaght/IndieSpeedRun into Master_2

Conflicts:
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
Merge branch 'Zc-Z' into Master_2

Conflicts:
	Gemini/Assets/New Art/Materials/WholeBack.png.meta
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/InspectorExpandedItems.asset
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
f5
Merge branch 'Atlas_3' into Master_2

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

Conflicts:
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
Merge branch 'Atlas_3' into Master_2

Conflicts:
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
Merge branch 'Atlas_3' into Master_2

Conflicts:
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
rebirth
REBIRTH
f5
Merge branch 'Zc-Z' into Master_2

Conflicts:
	Gemini/Assets/AtlasScene/Atlas_NewArt.unity
	Gemini/Assets/Material/effect/spotlight.psd
	Gemini/Assets/New Art/Materials/Materials/TestBlur.mat
	Gemini/Assets/New Art/New Art Full/Building_1.png
	Gemini/Assets/New Art/New Art Full/Clondbackground_4.png
	Gemini/Assets/New Art/New Art Full/CloudBackground_3.png
	Gemini/Assets/New Art/New Art Full/Crystal.png
	Gemini/Assets/New Art/New Art Full/Crystal_2.png
	Gemini/Assets/New Art/New Art Full/Fog1.png
	Gemini/Assets/New Art/New Art Full/Fog2.png
	Gemini/Assets/New Art/New Art Full/Island.png
	Gemini/Assets/New Art/New Art Full/Island_2.png
	Gemini/Assets/New Art/New Art Full/Leaf.png
	Gemini/Assets/New Art/New Art Full/Tree1.png
	Gemini/Assets/New Art/New Art Full/Tree2.png
	Gemini/Assets/New Art/New Art Full/Tree3.png
	Gemini/Assets/New Art/New Art Full/Tree4.png
	Gemini/Assets/New Art/New Art Full/Tree5.png
	Gemini/Assets/New Art/New Art Full/Tree6.png
	Gemini/Assets/New Art/New Art Full/Tree7.png
	Gemini/Assets/New Art/New Art Full/Tree8.png
	Gemini/Assets/New Art/New Art Full/Tree9.png
	Gemini/Assets/New Art/New Art Full/Waterplant_Head_1.png
	Gemini/Assets/New Art/New Art Full/Waterplant_Head_2.png
	Gemini/Assets/New Art/New Art Full/Waterplant_line.png
	Gemini/Assets/New Art/New Art Full/background.png
	Gemini/Assets/New Art/New Art Full/boxTree.png
	Gemini/Assets/New Art/New Art Full/bubble.png
	Gemini/Assets/New Art/New Art Full/bubble_2.png
	Gemini/Assets/New Art/New Art Full/bubble_3.png
	Gemini/Assets/New Art/New Art Full/cloud_background_2.png
	Gemini/Assets/New Art/New Art Full/clound_background.png
	Gemini/Assets/New Art/New Art Full/darkUniverse.png
	Gemini/Assets/New Art/New Art Full/darkUniverse2.png
	Gemini/Assets/New Art/New Art Full/island_3.png
	Gemini/Assets/New Art/New Art Full/island_4.png
	Gemini/Assets/New Art/New Art Full/island_5.png
	Gemini/Assets/New Art/New Art Full/starbackground.png
	Gemini/Assets/Prefab/Stars/Light.prefab
	Gemini/Assets/Script/CharControl_upanddown2.cs
	Gemini/Assets/Script/FallenStarRecharge.cs
	Gemini/Assets/Script/LightStar/LightStar.cs
	Gemini/Assets/Script/LightStar/blackMyst.cs
	Gemini/Assets/Script/LightStar/charFaint.cs
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/InspectorExpandedItems.asset
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
	Gemini/ProjectSettings/TagManager.asset