delete config/application.yml
delete config/application.yml
merge conflicts
pulled from master
resolved merge conflicts
merge
tumblr search can handle spaces
search working again
some styling, tumblr additions
Merge pull request #17 from BlakeJenningsJohnson/posts

Posts
Merge pull request #16 from BlakeJenningsJohnson/searches

tumblr search can handle spaces
merge conflicts
fixed merge conflicts
fixed searches to correctly pass params