added city to top
Merge branch 'master' of github.com:litenup/git-mania
t

Merged two devs changes

 Please enter a commit message to explain why this merge is necessary,
 especially if it merges an updated upstream into a topic branch.