merged join lobby and join room events
Merge pull request #1 from jeffreyyoung/mc-1

merged join lobby and join room events