Use canola oil instead of vegetable oil
Fix typo in canola
Merge branch 'different-oil'

* different-oil:
  Fix typo in canola
  Use canola oil instead of vegetable oil

Conflicts:
	cake-recipe.txt