Make waiting room smarter
Merge branch 'master' of github.com:adr2370/MockTok