More work on increment
Merge branch 'master' of https://github.com/kylelin47/cities-database

Conflicts:
	cities.php
Headings changes for increment table