Change Vegtable oil to canola
Merge branch 'master' into canola_oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from chrisl8/canola_oil

Change Vegtable oil to canola