Changed oil to cannola oil from vegetable oil
Corrected typo canola instead of cannola
Merge branch 'master' into different-oil

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

Changed oil to cannola oil from vegetable oil