Merge branch 'master' into Weili-Gu
Merge branch 'Weili-Gu'
Merge branch 'master' into Weili-Gu
...change to 2d
Merge branch 'Weili-Gu'
change to 2d
Merge branch 'Weili-Gu'
..
Merge branch 'master' into Weili-Gu
Merge branch 'Weili-Gu'
Merge branch 'master' of https://github.com/weiligu/ItinerantCity

Conflicts:
	Assets/Prefabs/soldier.prefab
	Assets/Resources/enemy1.prefab
	Assets/Scenes/CityView3.unity