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 lusv/different-oil

Use Canola Oil instead of Vegetable Oil