Add ingredients to a chili-recipe
Modified chili-recipe to make conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	chili-recipe.txt