add multi_json for rdio
add gemfile
merge conflict resolution
Merge branch 'master' into rdio-integration
add task: get rdio_id from echonest search
add webplayer to nav
style webplayer controls
Merge pull request #18 from hartsick/rdio-integration

Rdio integration