Changed to Canola oil
Merge branch 'master' of https://github.com/clu55ter/recipes into different-oil

Conflicts:
	cake-recipe.txt