substitute veg oil with canola
Merge branch 'master' of https://github.com/taguri/recipes into different-oil

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

substitute veg oil with canola