Merge branch 'master' of C:\Chatc\ChatClient with conflicts.
:)zdvs
Merge remote-tracking branch 'origin/master'