add city to bottom of ol
Merge branch 'master' of https://github.com/AndrewGardhouse/git-mania

Conflicts:
	cities.html