Use canoli oil
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
Merge pull request #3 from zhuoweic/different-oil

Use canoli oil