Fixed first issue
Merge branch 'master' of https://github.com/manu29d/chatapp