use canola oil instead of vegetable oil
correct typo
Merge branch 'master' into different-oil

* master:
  Merge pull request from more-oil

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

use canola oil instead of vegetable oil