change vegetable oil to canola oil
fix typo
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
Merge pull request #2 from sanjayakumar/different-oil

Different oil with fixed typo and further merges