merge conflict
merge conflict resolved
Made final refinements to the NYTimes search

* finalized query formatting and content for the Times API in the app/services/nytimes_messenger.rb file
Merge pull request #54 from tyleraadams/bug/nyt_search

Bug/nyt search
added logic to route method, returning json object with array of child company names
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
Merge pull request #55 from juliahimmel/master

Css implementation
handling merge conflicts
fixed merge conflicts
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
Merge pull request #56 from juliahimmel/master

Css implementation
resolving merge conflicts
merge conflict resolved
fixed extra end in application controller due to merging
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
refactored application controller

-took freebase API calls out of controller and into freebase_service
Merge pull request #57 from onweapps/master

Refactored application controller
refactored: get results no longer a class method
refactored call for child companies - created children method for readability
added more efficient query to Freebase, grabbing all children with one call