Redone a bit
Merge branch 'master' of https://github.com/daggs/DaChat