Chili
Merge branch 'master' of https://github.com/quiethunter/recipes

Conflicts:
	chili-recipe.txt