before merge with mobile
Merge branch 'master' of github.com:exclusiveLogin/chatForFriends