WIP getting join user to room passing test.
Merge remote-tracking branch 'origin/master'