Changed Vegetable Oil to Canola Oil
Merge branch 'master' into different-oil

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

Changed Vegetable Oil to Canola Oil