Merge pull request #4 from jamcohen/jake

Ingredients and CSS merge
fixed break
Merge branch 'master' of https://github.com/jamcohen/CS183_Project
Finally got dishes to add with ingredients