Merge pull request #4 from henyinsitan/master

Add LoginAndRegist
save
Merge branch 'master' of https://github.com/lustyangel/1-2saleApp

Conflicts:
	1-2saleApp.xcodeproj/project.pbxproj
123
update
总体 整合
Merge pull request #1 from lustyangel/master

New