modified cities.html
Merge https://github.com/zhaoxiaopeng/git-mania

Conflicts:
	cities.html