Merge Error Fix
Merge branch 'master' of https://github.com/weiligu/ItinerantCity

Conflicts:
	Assets/Scenes/CityView3.unity
	Assets/Scripts/CombatScript.cs