Add canola oil instead of vegetable oil.
Merge branch 'master' into modify-cake

Conflicts:
	cake-recipe.txt
Merge pull request #1 from robertjgraves/modify-cake

Add canola oil instead of vegetable oil.