12
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun

Conflicts:
	Gemini/Assets/Material/Building.mat
	Gemini/Assets/Nick Scene/NickIGF5.unity
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
ASD
fgjh
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun

Conflicts:
	Gemini/Assets/Material/Building.mat
	Gemini/Assets/Script/Nick/audioManager.cs
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Assets/Script/Nick/audioManager.cs
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
12
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Library/assetDatabase3
21
qwe
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
123
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun

Conflicts:
	Gemini/Library/assetDatabase3
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Assets/Script/CharControl_upanddown2.cs
	Gemini/Library/assetDatabase3
123
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun

Conflicts:
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Assets/Script/Camera_3D.cs
	Gemini/Library/InspectorExpandedItems.asset
	Gemini/Library/guidmapper
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun
Merge branch 'master' into Zc-Z