initial solution
Merge branch 'master' of https://github.com/teschnei/CMPUT404-assignment-websockets