error expected
Merge branch 'master' of github.com:LaurenHearnden/git-mania

Conflicts:
	cities.html