merge conflict resolution
Merge branch 'master' of https://github.com/tyrbo/tunefish
add div
merge conflict in activity, merged in extra div
div got lost, now its back
users have followers and an api endpoint
followers should return activities too
changed subscription to youtube subscription, added model and template for user subscription
set async retrivial of subscriptions
Add controller/endpoint for subscription activities

Here we need to differentiate between normal user activity and activity
that will be present in their feed from followed users.  Ember will have
an easy time identifying the difference between activities and
subscription_activities even though they caontain essentially the same
information.
Add seeds for users and activities
added seed data, renamed subscription activity for clarity
users follow button makes post request for follow to rails
Merge branch 'master' of https://github.com/tyrbo/tunefish into user_subs
merge conflict resolution
Merge branch 'allisonlarson-user_subs'
Resolves merge conflicts