edit file location
Merge branch 'city' of https://github.com/nuroko/nurokit into city

Conflicts:
	src/test/clojure/nuroko/demo/city.clj
Merge branch 'city' of https://github.com/nuroko/nurokit.git into city