Changed cake-recipe
Fix typo in canola
Merge branch 'master' into different-oil

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

Changed cake-recipe