adding chat
Merge branch 'feature/add-chat'