first commit
Merge branch 'master' of https://code.csdn.net/hpccn/citymanager

Conflicts:
	README.md