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

Conflicts:
	Assets/animControl/playerBody.controller
	Assets/scenes/FirstIteration.unity
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/4e/4e5cfd9179da0420c8dc84854350f2a3
	Library/metadata/4e/4ed3e64b1680e4ea086d7e0ec9c31d64
	Library/metadata/58/581d08b4d3d02464ea8ba96c2a515f2b
	Library/metadata/68/6804babace5cc47dd8b61abb292c4be2
	Library/metadata/95/951e75334680d44feb997c0ce496c176
	Library/metadata/99/994f1da77f77549209b3fe42febad8f7
	Library/metadata/a3/a32a8139423774619b127604b608ddc1
	Library/metadata/ed/edc100bc378c04d4bb33a708d610cc77
	ProjectSettings/Physics2DSettings.asset
	Temp/UnityTempFile-5f86da9ef5dee4ff09fb7be59a8cf9d6
	Temp/UnityTempFile-a9d982cbcc9194431831baadb1039746
	Temp/UnityTempFile-af272e0a03b7249319d8977d762c3c88
	Temp/UnityTempFile-afc4502937b114cf6a9947fa965468a0
	Temp/UnityTempFile-b5ed03726b5fa4395afa12426b8f7715
	Temp/UnityTempFile-c841c90210c5740a298f8c572d8b8312
	Temp/UnityTempFile-d3e46198f3411461f9928d5b207b7adc
	Temp/__EditModeScene
	Temp/bin/Debug/Assembly-CSharp.dll
	Temp/bin/Debug/Assembly-CSharp.dll.mdb
	WhoTookMyHead-csharp.sln
	WhoTookMyHead.sln
	WhoTookMyHead.userprefs
Merge branch 'master' of https://github.com/qiminl/WhoTookMyHead

Conflicts:
	Assets/animation/jump17.anim
	Assets/animation/triangleHeadWalk.anim
	Assets/prefab/NPC1.prefab
	Assets/prefab/boxCollider.prefab
	Assets/scenes/FirstIteration.unity
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/metadata/0b/0bca730b39651410ab5df0ca59b9d1c2
	Library/metadata/53/53804f2e8905d4b6db6e4169f560420b
	Library/metadata/58/581d08b4d3d02464ea8ba96c2a515f2b
	Library/metadata/79/79a41a3212a5641e7bc9de882d492620
	Library/metadata/8a/8a3274e391ec5493bb96f4acb2946fe7
	Library/metadata/99/994f1da77f77549209b3fe42febad8f7
	Library/metadata/ae/ae7c6020f205f46518e0de2e0678e68e
	Library/metadata/bf/bf08661c79a5c4dada528f8c2e6fe107
	Library/metadata/cd/cd1601687d7e7407dbd8c38b2f98717f
	Library/metadata/d3/d3de7b7cf32144989a7151b9cd71fc55
	Library/metadata/e2/e2087465b352545d381832f9f4171a39
	Library/metadata/e5/e5ed6ec65899d42619c89e007c875f7b
	Library/metadata/ea/ea05b5e773ab64e0abe9a5ae4b9c9406
	Temp/__BuildPlayer Backupscene
	Temp/__EditModeScene
	Temp/bin/Debug/Assembly-CSharp.dll
	Temp/bin/Debug/Assembly-CSharp.dll.mdb