a
第三方登录，还差绑定界面
登录
Merge branch '修改头像'
no message
Merge commit '661bac96c01187f4568b389a01ab08420deaacca'

Conflicts:
	ScreenShow/我/MyStoryBoard.storyboard
Merge pull request #6 from liop/master

liop'修改第三方登录的实现