Vegetable -> canola oil
Merge branch 'master' of https://github.com/zzzyzx/recipes into different-oil

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

Vegetable -> canola oil