feed has tabs for user and subscribed music
styling
Merge pull request #27 from allisonlarson/master

Open Youtube Modal
Remove git stuff from api/activities_controller.rb
Add request spec for activites API
Add requst spec for youtube subscriptions; fix spelling
WIP youtube_subscriptions#update spec
 merge conflict resolution
Merge branch 'master' of https://github.com/tyrbo/tunefish
add div
moar styles
merge conflicts
user page has content
user has photos and styling
Add requst spec for youtube subscriptions; fix spelling
Fix merge conflicts
Fix activities/index.hbs, missing div tag causing styling issues
Add views/click handlers for activity filters
Add view helpers to activities/index.hbs for filtering by provider

Also adds more specific classes for youtube/soundcloud activity in order
to be able to toggle them separately.  jQuery toggle() flips the display
property on the given elements (from block to none) for example.  There
are other ways to do it but it seems to be a good solution, it's super
responsive once all of the activities have been loaded.
Filter checkboxes are 'on' by default

It makes more sense to have them toggled on, ux felt weird with
checkboxes needing to be checked in order to remove a particular
provider from your feed.