Use canola oil instead of vegetable oil
fix canola typo
Merge branch 'master' into different-oil

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

Use canola oil instead of vegetable oil