Ingredient class changed
Merge branch 'master' of https://github.com/lagecamp/CMPUT301W13T02.git