jeff third commit
Merge branch 'master' of https://github.com/JamesTargett/git-mania

Conflicts:
	cities.html