added dummy ingredient function
Merge branch 'master' of https://github.com/tomkennedy22/DB-GUI-Fall2014
getIngredient
fix merges
getIngredient returning json
Merge branch 'master' of https://github.com/tomkennedy22/DB-GUI-Fall2014