push
r
Merge branch 'Master_2' of https://github.com/HawkDaght/IndieSpeedRun into Master_2

Conflicts:
	Gemini/Assets/Script/NickNew/RiseActivateStar.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-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/93/93e7c572c933b8c4d99a5540fddf50ca
	Gemini/Library/metadata/fb/fb35b35e361e645438567ce8cfb5c651