Merge pull request #47 from tyleraadams/bug/missing_ends

missing ends in application_controller.rb
opened service file for freebase api
resolving merge conflicts
resolving merge conflicts
Merge pull request #48 from onweapps/master

opened service file for freebase api
merge conflict
changes to UI

* added toggle function to long results text
* began changing main.scss to reflect new branding
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 pull request #50 from onweapps/master

Created Freebase Service
merge conflict resolved