Update to canola oil (from vegetable oil)
Fix typo in canola
Merge branch 'master' into different-oil

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

Update to canola oil (from vegetable oil)