add 2D animation
add Floor
add floor
add Zombie
add Actor
Zombie Animator
modify Actor and zombie
Merge branch '2DAnimation' of https://github.com/VincentSai/WhatDoYouSee into 2DAnimation
ZombieDead
add Zombei Dead
Merge branch '2DAnimation' of https://github.com/VincentSai/WhatDoYouSee into 2DAnimation
rename animator
Merge branch '2DAnimation' into Merge-Animator

Conflicts:
	Assets/Model/readme.rtf.meta
	Assets/Scenes/Animation.unity
	Assets/Scenes/readme.rtf.meta
	Assets/Scripts/readme.rtf.meta
	Assets/Textures/Actor1_B_Stand_0.png
	Assets/Textures/Actor1_B_Stand_1.png
	Assets/Textures/Actor1_B_Stand_2.png
	Assets/Textures/Actor1_B_Walk_0.png
	Assets/Textures/Actor1_B_Walk_1.png
	Assets/Textures/Actor1_F_Stand_0.png
	Assets/Textures/Actor1_F_Stand_1.png
	Assets/Textures/Actor1_F_Stand_2.png
	Assets/Textures/Actor1_F_Walk_0.png
	Assets/Textures/Actor1_F_Walk_1.png
	Assets/Textures/Actor1_L_Stand_0.png
	Assets/Textures/Actor1_L_Stand_1.png
	Assets/Textures/Actor1_L_Stand_2.png
	Assets/Textures/Actor1_L_Walk_0.png
	Assets/Textures/Actor1_L_Walk_1.png
	Assets/Textures/readme.rtf.meta
	Assets/Textures/roadside_1.psd.meta
	ProjectSettings/ProjectSettings.asset
Merge branch '2DAnimation' into Merge-Item01
add Actor Animation
modify Actor
Gun Change
Gun2
Merge branch 'Merge-Item01'
Merge branch '2DAnimation' into Merge-Animator