added Tokyo
Merge github.com:shannondoah/git-mania

Conflicts:
	cities.html