Merged.
Merge.
Comment out ruby version in gemfile.
Merge
Transfer contents of donut.js file to home.js file. Donut data is no longer hard-coded.
Add to seeds file.
Add basic model validations for company and silicon.
Merge branch 'master' of https://github.com/xinecoulter/MadeInNY