Finished coding
Merge branch 'master' of https://github.com/abramhindle/CMPUT404-assignment-websockets into workingOnWebSockets
Somewhat finished functionality