switch from vegetable oil to canola oil
fixed canola typo
Merge branch 'master' into different-oil

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

switch from vegetable oil to canola oil