Change oil type to canola.
Fix "canola" typo.
Merge branch 'master' into different-oil

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

Change oil type to canola.