12367890-
Merge branch 'master' of https://github.com/qiminl/WhoTookMyHead

Conflicts:
	Assets/scenes/DarkForest.unity
	Assets/scenes/Main Scene.unity
	Library/assetDatabase3
	Library/guidmapper
	Temp/__EditModeScene
	Temp/bin/Debug/Assembly-CSharp.dll
	Temp/bin/Debug/Assembly-CSharp.dll.mdb
	WhoTookMyHead-csharp.sln
	WhoTookMyHead.sln
	WhoTookMyHead.userprefs