change location placeholder to 'city'
Merge branch 'master' of https://github.com/mud-turtles-2014/GoBug
fix merge conflicts