Merge branch 'tumblr' of github.com:ashag/SeeMore into sign-out
Merge branch 'master' of github.com:ashag/SeeMore into tumblr
added tumblr client gem
fixed gemfile.lock and starting tumblr search
fixed merge conflicts
trying to fix tumblr client
Tumblr client now working
tumblr search works
logic for tumblr api 404 response in view
Merge pull request #8 from ashag/tumblr

Tumblr search function up and running!
Fixed merge conflicts in results view