Completed fixed chat
Merge branch 'master' of https://github.com/sstraw/csci201-Group
Auto-Merged fixed chat and serverThread