merged frontend
Merge branch 'master' of https://github.com/amoskyler/rdio-room-js