Changed oil from vegetable oil to canola oil.
Merge branches 'master' and 'different-oil'

Conflicts:
	cake-recipe.txt