changed Tokyo's population
Merge branch 'master' of github.com:tech-bluenette/git-mania

Conflicts:
	cities.html