vegetable oil to canola oil
Merge branch 'master' of https://github.com/ledrui/recipes into different-oil

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

vegetable oil to canola oil