Add Canola Oil instead of Vegetable Oil
Merge branch 'master' into different-oil

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

Add Canola Oil instead of Vegetable Oil