changed to canola oil
fix spelling
Merge branch 'master' into different-oil

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

changed to canola oil