new spice!
Merge remote-tracking branch 'upstream/master'

Conflicts:
	chili-recipe.txt