冲突解决
Merge branch 'master' of https://github.com/XIAOPIU/beatyHelp

Conflicts:
	beatyHelp/Main.storyboard