can join a karaoke room
Merge branch 'master' of https://github.com/owenchu/kbuddy
js commit
resolved conflicts