My changes
Merge branch 'master' of ssh://github.com/mmankows/chat