fiddle with formatting
Merge branch 'master' of github.com:rmoshier/SeeMore-Salmon
remove comment
add two tests
tidy routes
add neat formatting
fiddle with ajax
add note about next steps
Re-name model as feed, update associations
update associations
update associations
delete subscription model
rename subscriptions table as feeds table
update feed model and create Subscriptions join table
add unfinished attempt to add feeds using ajax...
Merge branch 'master' of github.com:rmoshier/SeeMore-Salmon
Merge branch 'master' into kristen