B commit
Merge branch 'master' of github.com:litenup/git-mania

Conflicts:
	cities.html