chili modified
Merge remote-tracking branch 'origin/master'

Conflicts:
	chili-recipe.txt
canola oil
misspelled canola
Merge branch 'master' of https://github.com/neosimus/recipes
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from neosimus/different-oil

Different oil