gitignore, again
delete yml
Merge branch 'master' into tumblr
sti
Merge branch 'master' of github.com:BlakeJenningsJohnson/stalkmore
Merge branch 'master' into tumblr
added application.yml to gitignore
merge
deleted provider from feeds table
Merge pull request #11 from BlakeJenningsJohnson/tumblr

Tumblr
Added individual feed models
Merge branch 'master' of github.com:BlakeJenningsJohnson/stalkmore into rss
Merge pull request #12 from BlakeJenningsJohnson/STI

Sti
Merge branch 'master' of github.com:BlakeJenningsJohnson/stalkmore into rss
added rss add feed and error message