add city
Merge pull request #1 from aavaolja/branch1

add city