committing for merge
Merge branch 'master' of github.com:alexshook/trippindots
soundcloud
fixing merge conflicts in gemfile and echo_nest_search
Merge branch 'master' of github.com:alexshook/trippindots
Merge branch 'master' of github.com:alexshook/trippindots
updating readme