Spiced it up
Merge remote-tracking branch 'origin'

Conflicts:
	chili-recipe.txt