fix link to log in and take to activity feed
change soundcloud icon
merge conflicts
working through youtube
remove pry
Merge branch 'master' of https://github.com/tyrbo/tunefish
Merge pull request #20 from allisonlarson/master

Last minute finishes