Removed warnings
our messed up edits in class; delete if necessary
Merge branch 'master' of https://github.com/peigen831/ChatSockets