canola oil
fix typo
Merge branch 'master' into cake-exp

Conflicts:
	cake-recipe.txt
Merge pull request #1 from YCSU/cake-exp

canola oil