switch to canola oil
Merge branch 'master' into diff-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from dblsesame/diff-oil

switch to canola oil