Add simple chat
Merge branch 'simple-chat'