changed vegetable-oil with canola
typo fixed
Merge branch 'master' into different-oil

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

changed vegetable-oil with canola