first commit
Merge branch 'master' of https://github.com/nerorevenge/chat-application

git wouldn't let me push