null
Merge branches 'master' and 'master' of https://github.com/q188079726/healthManager

Conflicts:
	HealthManager.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/q188079726/healthManager