Change oil from vegetable to canola
Change back to vegetable oil
Merge branch 'master' of https://github.com/cwilson7938/recipes into different-oil

Conflicts:
	cake-recipe.txt
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt