Merge pull request #49 from keaty/master

changes to UI
Created Freebase Service
- method to get IDs of all children of a company
- method to retrieve the name given an id
- method to combine the two and return all children names

Need to:
- refactor API call into one if possible
- move other API calls from controller into class
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
Merge pull request #50 from onweapps/master

Created Freebase Service
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