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

Conflicts:
	Assets/scenes/BossScene.unity
	Assets/scenes/IntroScene.unity
	Assets/scenes/Main Scene.unity
	Assets/scenes/SunScene.unity
	Library/assetDatabase3
	WhoTookMyHead-csharp.sln
	WhoTookMyHead.sln