Change oil from Vegetable to Canola
Merge branch 'master' of https://github.com/tralpha/recipes

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

Change oil from Vegetable to Canola