Change vegetabl oil into canola oil in cake-recipe.txt
correct the spelling mistake of canola oil
Merge branch 'different-oil'

Conflicts:
	cake-recipe.txt