fix small bugs
Merge branch 'private' of github.com:exclusiveLogin/chatForFriends into private