init
Merge branch 'master' of https://github.com/wghwang/hangzhou_health

Conflicts:
	code/Demo_南京/Demo.xcodeproj/project.pbxproj
	code/Demo_南京/Demo/Demo-Info.plist
ok init