switch vegetable oil to canola oil
fix canola typo
Merge branch 'master' into new-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from jmdeon/new-oil

switch vegetable oil to canola oil