Eric-2
Merge branch 'master' of github.com:ericjhlee/git-mania

Conflicts:
	cities.html