change to chili-recipe.txt
Merge remote-tracking branch 'origin/master'

* origin/master:
  Remove cumin from chili

Conflicts:
	chili-recipe.txt