Revert b34be75..456c0f9

This rolls back to commit b34be75c6b6f064b549b414412324ead822fc0b3.
Revert f0db439..9751931

This rolls back to commit f0db439bfc4f13a903ab8ec5b2f6c8048887045d.
ll
Merge branch 'master' of https://github.com/qiminl/WhoTookMyHead

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