change oil ot canola
Merge branch 'master' of https://github.com/paultgibbons/recipes into different-oil

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

change oil ot canola