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

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/scenes/SunShine Scene.unity
	Assets/scripts/PlayerControl.cs
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/68/6804babace5cc47dd8b61abb292c4be2
	Library/metadata/6c/6c8dc5866b5324a28a6cd0fde07b7d97
	Temp/__EditModeScene
	Temp/bin/Debug/Assembly-CSharp.dll
	Temp/bin/Debug/Assembly-CSharp.dll.mdb
	WhoTookMyHead.userprefs