Change to canola oil
Merge branch 'master' of https://github.com/G-Robert/recipes into different-oil

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

Change to canola oil