Added omniauth for rdio
messing around with update crud angular, before merging with omniauth rdio feature
resolved merge conflicts
Merge pull request #30 from paulhyunkim/aarontsangbranch

Aarontsangbranch
Merge branch 'master' into stylebranch
have rspec running