Merge pull request #9 from tyleraadams/master

fixed merge conflict, added database migrations, models and fair trade seed data
Added search functionality for freebase with search box on homepage
- restricted searches to companies
- searching freebase and grabbing parent companies
- companies are searched for in NYT
- results are returned in JSON format as follows

results = {
            "gatorade" => { "nyt" => [{date: 090909, title: "title", url: "http..."}, ...], "certifications" = {} },
            "pepsico" =>  { "nyt" => [{date: 090909, title: "title", url: "http..."}, ...], "certifications" = {} },
            "other_parent" =>  { "nyt" => {}, "certifications" = {} }
  }
Added main SCSS file. Stored all colors as variables. Put in most of styling for type. That still needs to be applied. Put in links to all 3 web fonts.
Merge pull request #1 from juliahimmel/css

Added main SCSS file. Stored all colors as variables. Put in most of sty...
Merge pull request #10 from onweapps/master

Added search functionality for freebase with search box on homepage
resolved small merge conflict
Merge branch 'master' of https://github.com/juliahimmel/ConsciousConsumer-1 into css
Merge pull request #2 from juliahimmel/css

Css
added Gemfile.lock to .gitignore file
Merge pull request #13 from keaty/master

added Gemfile.lock to .gitignore file
Merge pull request #12 from juliahimmel/master

SCSS update
Merge pull request #11 from tyleraadams/rainforest_alliance_certs

Added Rainforest Alliance certfications
uncommented debugger from Gemfile
added image, made it the background
moved ajax call into freebase directory
Merge pull request #14 from tyleraadams/master

Added certificate model function calls to seed file
Merge pull request #15 from onweapps/master

moved ajax call into freebase directory
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
styled intro dic, search box
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer into css