Change vegetable oil to canola oil
Changed canola back to vegetable oil. Forgot to make new branch first.
Change oil from vegetable to canola
Merge branch 'master' of https://github.com/SamLents/recipes
Merge branch 'oil-change'

Conflicts:
	cake-recipe.txt