Change the oil type to canola.
Merge branch 'master' of https://github.com/curvedspace/recipes into change_oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from curvedspace/change_oil

Change the oil type to canola.