whaaat
this
Merge branch 'master' of https://github.com/Starlight-Design/git-mania

Conflicts:
	cities.html