上传更新
Merge branch 'master' of https://github.com/XIAOPIU/beatyHelp

Conflicts:
	beatyHelp.xcodeproj/project.pbxproj