Merge pull request #7 from keaty/master

created a .gitignore file
Added ActiveRecord associations and models

* added 4 models
  * certificate
  * certification
  * company
  * industry
* added 4 migrations
 * companies
 * certificates
 * certifications
 * industries
Renamed migration folder to migrate. Ran Migrations. Scraped data from FTF and FTUSA to seed database with companies and certifications.

* db/migration => db/migrate
* ran db:migrate
* created Certificate methods to scrape data from FTF and FTUSA
* added config/ftf_members.html - html file converted from PDF of FTF data
* seeded database with scraped info
gemfile
added .ds_store to fix merge
Merge branch 'chore/seed_database_fairtrade'

* ran "git add .DS_STORE"
* fixed merge conflict maybe?
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" = {} }
  }
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