change order of execution in controllers
merge conflict rez
modal figuring out stuff
Add YoutubeSubscription to the database

Get rid of tracked_subscriptions, now tracking is done with a boolean
column.
Delete user_controllers_spec.rb
Serve json from youtube subs controller
Update activities and users controller
Update User#add_tracked_subscriptions to use new schema
Ember is recieving json from rails api for youtube subscriptions
Update SessionsController
Fix merge conflicts
found modal-backdrop bug
merge resolution
fix modal not closing bug
Merge pull request #23 from allisonlarson/sub_modal

Sub modal
fix bug, file wasn't added
Merge branch 'master' of https://github.com/tyrbo/tunefish into sub_modal
merge
Updated production Dockerfile and specified the proper host information for production database.
Update User#parse_subscriptions to use new schema

Pulled external API logic out of the user model