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

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

Change vegetable oil to canola oil.