city_name removed
Merge branch 'develop' of https://github.com/cschrader/hcking into develop