add canola oil to new branch
Fixed spelling canola
Merge branch 'master' into different-oil
Merge branch 'master' into different-oil

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

add canola oil to new branch