fixed bug, parents only coming back if they exist
Moved NYTimes API logic out of application_controller.rb
* created app/services folder to hold our service objects
* created nytimes_messenger service class to handle all Times api calls - less class methods
* application controller makes an instance of NytimesMessenger to fetch new articles
Merge pull request #41 from onweapps/master

fixed bug, parents only coming back if they exist
Merge branch 'tyleraadams-refactor/nyt_search'. Resolving merge conflict
Merge pull request #43 from keaty/master

Edited view to accommodate new JSON response structure
fixed bug where parentless companies were erroring
Merge pull request #44 from onweapps/master

fixed bug where parentless companies were erroring
Merge remote-tracking branch 'upstream/master'. Resolved merge conflicts.

Conflicts:
	app/controllers/application_controller.rb
Merge branch 'master' of https://github.com/fiddler-crabs-2014/tattle. Resolving merge conflict part 2

Conflicts:
	app/controllers/application_controller.rb
Merge pull request #46 from tyleraadams/master

merge conflict
missing ends in application_controller.rb
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
changes to UI

* added toggle function to long results text
* began changing main.scss to reflect new branding