added tumblr_client to gemfile
whitespace
Merge branch 'tumblr' of github.com:BlakeJenningsJohnson/stalkmore into tumblr
Added figaro
Merge branch 'tumblr' of github.com:BlakeJenningsJohnson/stalkmore into tumblr
I MADE A TUMBLR SEARCH
Modified search to display title and a link
added a feed model
fixed link
Added search not found notice
html search show
Merge pull request #6 from BlakeJenningsJohnson/tumblr

Looks good.
added config/app.yml to gitignore
merge conflict
merged, deleted twitter version num
delete config/application.yml
delete config/application.yml
created feeds model