fixed chat
Merge branch 'master' of github.com:mrtrom/ProjectTalkus