created ingredients migration
ingredient rake task file completed
model tests written for ingredients
fixed spelling error for recipes controller and now passing ingredients model tests
fixed merge conflicts when merging with master
Merge pull request #12 from fiery-skippers-2014/seed_ingredients

Seed ingredients looks great!
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem
Merge branch 'master' into html_setup