Changed oil from vegetable to canola
Update oil
Merge branch 'master' of https://github.com/Jakeimo/recipes into different-oil

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

Changed oil from vegetable to canola