changed to canola oil
Merge branch 'master' into different-oils

Conflicts:
	cake-recipe.txt
Merge pull request #1 from pcdubb/different-oils

changed to canola oil