Chenged Vegetable oil to Canola oil
Merge branch 'master' into change-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from dgangwan/change-oil

Chenged Vegetable oil to Canola oil