1
Merge branch 'master' of https://github.com/wangminProject/Let-sChat

Conflicts:

Let'sChat.xcodeproj/project.xcworkspace/xcuserdata/wangmin.xcuserdatad/U
serInterfaceState.xcuserstate