first commit
second test
Merge branch 'master' of https://github.com/paraziit/chatApp