Fix City
Merge branch 'aji' of https://github.com/thomasmu/pegimakan into aji
Fix City again