Do this properly!
Merge branch 'master' of https://github.com/dags-/DaChat