updating after gui
Merge branch 'master' of ssh://github.com/grason/chat_server
tcp commit things