Replace oil
Correct typo for "canola"
Merge branch 'master' of https://github.com/turalf/recipes into different-oil

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

Replace oil