Change from vegetable to canola oil
correct typo
Merge branch 'master' into different-oil

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

Change from vegetable to canola oil