Made nicer, improved performance
Merge branch 'master' of https://github.com/christianjukna/CMPUT404-assignment-websockets