half working chat that you can only chat to yourself now
merge from remote master with local master