Merge pull request #28 from paulhyunkim/aarontsangbranch

test
messing around with update crud angular, before merging with omniauth rdio feature
resolved merge conflicts