work on city
Merge branch 'master' of https://github.com/Bradshaw/octo-hipster

Conflicts:
	src/assets/images/map.png