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

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

Use conola oil instead of vegetable oil