Replace vegetable oil with canola oil
Merge branch 'master' into different_oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from abhimanyuPathania/different_oil

Replace vegetable oil with canola oil