Add a new spice
Merge branch 'master' of https://github.com/katiepurdy/recipes

Conflicts:
	chili-recipe.txt