up to date
Merge branch 'master' of https://github.com/tyrbo/tunefish into managing-soundloud-account
ruby logic for percentages done
progress bar on page
add the progress bars in styling only
got serializer working the way I want
everything is working right, just need to make only one of each show up
everything is working right, just need to make only one of each show up
users have followers and an api endpoint
followers should return activities too
I have PERCENTAGES
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
percentage bar actually works now
added seed data, renamed subscription activity for clarity
Merge branch 'master' of https://github.com/tyrbo/tunefish into progress-bar

Conflicts:
	ember/app/templates/activities/index.hbs
	rails/app/controllers/api/activities_controller.rb
	rails/dump.rdb
everything up and working with master, but i vroke the filters in my merge
schema has changed