changed vegetable oil to canola
Fixed typo in cake recipe oil change
Merge branch 'different-oil'
Merge branch 'master' of github.com:dannc/recipes

Conflicts:
	cake-recipe.txt