yo
Merge branch 'master' of https://github.com/nvanzant/git-mania

Conflicts:
	cities.html