use a different oil in cake-recipe
fix the misspell of canola
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from liuyubobobo/different-oil

use a different oil in cake-recipe