Updated to use canola oil
Fixed spelling error of canola
Merge branch 'master' into different-oil

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

Updated to use canola oil