代码合并
代码合并
代码合并
Merge branch 'master' of https://github.com/XIAOPIU/beatyHelp

Conflicts:
	beatyHelp/loginView.swift