Replace 'Taipei' with 'TaiPei'
Merge remote-tracking branch 'origin/master'

Conflicts:
	cities