Change to vegetable oil to canola oil
Fix canola typo
Merge branch 'master' into different-oil

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

Change from vegetable oil to canola oil