Corrected websockets for chatroom
Merge conflict
Merge branch 'master' of github.com:StephanMusgrave/ProjectX