Merging Kyle's changes with the already pushed ones from Noah.
Manually copied contents of Baixing_CitySource.txt from github.com. Should have resolved merge conflict(s).