commit b4 merge
Merge branch 'master' of https://github.com/yibojiang/SuperSmash

Conflicts:
	Assets/Animals/downbody_horse.prefab
	Assets/Animals/downbody_tuoniao.prefab
	Assets/Animals/upbody_horse.prefab
	Assets/Animals/upbody_tuoniao.prefab
	Assets/Animation/horse/downbody/attack.anim
	Assets/Animation/horse/downbody/downbody_horse.controller
	Assets/Animation/horse/downbody/walk.anim
	Assets/Animation/horse/upbody/attack.anim
	Assets/Animation/horse/upbody/upbody_horse.controller
	Assets/Animation/horse/upbody/walk.anim
	Assets/Animation/tuoniao/downbody/attack.anim
	Assets/Animation/tuoniao/downbody/downbody_tuoniao.controller
	Assets/Animation/tuoniao/downbody/walk.anim
	Assets/Animation/tuoniao/upbody/attack.anim
	Assets/Animation/tuoniao/upbody/upbody_tuoniao.controller
	Assets/Animation/tuoniao/upbody/walk.anim
Merge branch 'master' of https://github.com/yibojiang/SuperSmash

Conflicts:
	Assets/Game.unity
Merge branch 'master' of https://github.com/yibojiang/SuperSmash

Conflicts:
	Assets/Animation/tuoniao/upbody/attack.anim
	Assets/Animation/tuoniao/upbody/idle.anim
	Assets/Game.unity