Change vegetable oil to canol oil.
Correct canola oil typo.
Merge branch 'master' into different-oil

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

Change vegetable oil to canol oil.