Use canola oil instead of vegetable oil
Fix canola typo
Merge branch 'different-oil'

Conflicts:
	cake-recipe.txt