Revert "canola oil"
Merge branch 'master' into revert-1-different-oil

Conflicts:
	cake-recipe.txt
Merge branch 'revert-1-different-oil'