Add 1/2 cup of olive to the mix.
Merge branch 'master' into different-oil

Conflicts:
	chili-recipe.txt