Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
Monday 21st homework
update cookbook hmt
w3d1 homework initial commit
working drop down menu of ingredients, still need to fix quantity
update cookbook hmt
w4d1 Recipes show IngredientsRecipes in arrays
has many through associations established for recipe and ingredient
w4d1 Recipes show IngredientsRecipes in sentences
views incorporated
cooking homework 21st april
w4d1 Show recipe, ingredients_recipe working, editing not implemented
some styling added
Merge remote-tracking branch 'upstream/master'
final before homework review
Merge pull request #171 from bgkennedy2000/master

Homework w4d1
Merge pull request #178 from ScottyGams/master

Adding HW before review, something broke though. breaks on views
Merge remote-tracking branch 'upstream/master'
Merge pull request #176 from NirajVyas/master

Cookbook Homework