chatting fully implemented
Merge branch 'integratingChat'