fixed stupid bug
Merge branch 'master' of https://github.com/danielekbom/webchat_project