Changed vegetable to canola oil
Merge branch 'different-oil'
Merge branch 'master' of github.com:rpbbp/recipes

Conflicts:
	cake-recipe.txt