delete config/application.yml
delete config/application.yml
merge conflicts
added rss gem
Merge branch 'master' of github.com:BlakeJenningsJohnson/stalkmore into rss
Merge branch 'master' of github.com:BlakeJenningsJohnson/stalkmore into rss
added rss add feed and error message
added rss view feed goodies
pulled from master
refactoring based on twitter and tumblr setup
editing rss feature
fixed rss merge conflicts with master
updating rss to fit
fixed rss merge conflicts with master
resolved merge conflicts
merge
updated schema, throws error when adding twitter feed
rss feed returns user subscriptions and unneeded files deleted
integrated rss feeds with the rest of code
merge conflicts