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

Conflicts:
has many through associations established for recipe and ingredient
views incorporated
some styling added
Merge pull request #171 from bgkennedy2000/master

Homework w4d1