Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
added new colors and changed some fonts
Added route for fetching children
- empty route exists via get method
- reversed order of parents array for better display
added logic to route method, returning json object with array of child company names
added icon and logo pngs
Merge pull request #6 from juliahimmel/css-round-2

Css round 2
Merge pull request #51 from onweapps/master

Added route for fetching children
Merge pull request #52 from juliahimmel/master

CSS round 2 and images
dealing with merge issues
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
Fixed style merge issues

* added new sass variable names in place of old ones
Fixed controller merge issues

* added missing parentheses in main_controller
* added missing end in application_controller
Merge pull request #53 from keaty/master

Fixed style and controller merge issues
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