Combat Script and Monster Script
mosterAnimation&healthBar
Merge branch 'master' of https://github.com/weiligu/ItinerantCity
....
Merge branch 'master' of https://github.com/weiligu/ItinerantCity

Conflicts:
	Assets/Scenes/CityView3.unity