added city
Merge branch 'master' of https://github.com/dplotkin/Program3