...
Merge remote-tracking branch 'origin/master' into Vishnu
CityUpdatesSoldierTimeLimistGUIUpdates

Different buildings can be introduced
New soldiers can be introduced
Both show up on basic GUI
Costs and Requirements on GUI
City Movement
City Level Up
Soldier Time limit and Return to city mechanic
mergefromMaster
..
mergeFromMaster2
..
Merge remote-tracking branch 'origin/master' into Vishnu
..
Merge branch 'master' of https://github.com/weiligu/ItinerantCity

Conflicts:
	Assets/Scenes/CityView3.unity