new but broken code
Merge branch 'master' of https://github.com/trendsetter37/ChatClient1