refactor listIngredients
Fixed merges. Looking forward to merges
Merge branch 'master' of https://github.com/pogestudio/InteractionLab3