changed to canola oil
corrected spellling of canola
Merge branch 'master' into different-oil

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

changed to canola oil