handling merge conflicts
fixed merge conflicts
resolving merge conflicts
merge conflict resolved
Merge pull request #57 from onweapps/master

Refactored application controller
Merge pull request #58 from onweapps/master

refactored: get results no longer a class method
Merge pull request #59 from onweapps/master

Refactored tests
Implementation of styling

* added toggle animation
* added grid formatting
* tweaked margins
resolved merge conflict
Merge pull request #60 from keaty/master

Implementation of styling
Added 25000 entries from USDA Organics Database.

* added XL gem to parse a xlsx file
* added function to Certificate model to grab data from xlsx file
* Certificate model will need to be refactored - external source queries should go into service objects/classes
* added xlsx file to db directory
Resolving merge conflict. Merge branch 'feature/organics'
Added subsidiary company search feature (fin! ultimo!)

* Display other subsidiaries of parent companies on click
* Search other subsidiaries on click
Merge pull request #62 from keaty/master

Added subsidiary company search feature (fin! ultimo!)
merge conflicts
Made database more robust

* added descriptions for certificates
* added index to companies name field
* moved database scraping tasks out of Certificate model and into a service object called ScraperService
* converted class methods into instance methods
Merge branch 'master' of https://github.com/fiddler-crabs-2014/tattle into chore/merge
Merge pull request #64 from tyleraadams/chore/merge

Chore/merge
Update README.md
added arrow png