Change to canola oil
Merge branch 'different-oil' of https://github.com/mangan88/recipes

Conflicts:
	cake-recipe.txt