initial commit
Merge branch 'master' of github.com:caijun/geoChina

Conflicts:
	.gitignore