last city changedgit add cities.htmlgit add cities.html
Merge branch 'master' of github.com:pandabeat/git-mania

Conflicts:
	cities.html