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
I have PERCENTAGES
percentage bar actually works now
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
html did not have classses for filters
Merge pull request #31 from Hilaryous/progress-bar

Progress bar
Merge branch 'allisonlarson-user_subs'
Resolves merge conflicts
fix merge conflicts