Change oil in cake to canola
Merge branch 'master' of https://github.com/tnewport14/recipes into different-oil

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

Change oil in cake to canola