Merge pull request #1 from jetzhu/different-oil

new oil
Update chili-recipe.txt

make some difference from git webpage
make change locally to make conflict with web edit
Merge branch 'master' of https://github.com/jetzhu/recipes into different-oil

Conflicts:
	chili-recipe.txt