Add Ingredient
Fix previous commit
Fix merge
Merge branch 'master' of https://github.com/androidics48/recipes

Conflicts:
	chili-recipe.txt