almost
Merge branch 'master' into chat
chat was implemented
Merge branch 'chat'