Merge pull request #16 from aravindgd/develop

Develop
Merge branch 'master' of github.com:UDProducts/chat_app into develop
Merge branch 'develop' of github.com:UDProducts/chat_app into develop