Change vegetable with canola
Fix typo in canola
Merge branch 'master' into different-oil

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

Change vegetable with canola