Change oil from veg to canola
Fix canola 'typo'
Merge branch 'different-oil'

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

Change oil from veg to canola