U GOT TO HAVE CHILI PEPPER IN A CHILI CHILI
Merge remote-tracking branch 'origin/master'
Removed cumin, add chili
Conflicts:
	chili-recipe.txt