added habenero
Merge remote-tracking branch 'origin/master'
fixed chili recipe

Conflicts:
	chili-recipe.txt