Update chili-recipe.txt
Merge remote-tracking branch 'origin' into different-oil

Conflicts:
	chili-recipe.txt