Replace vegetable oil with canola oil.
Fix typo in 'canola'.
Merge branch 'master' into different-oil

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

Replace vegetable oil with canola oil.