add canola oil to recipe
Merge branch 'master' into different-oil

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

add canola oil to recipe