Change vegetable oil to canola oil
Merge branch 'master' into change-oil

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

Change vegetable oil to canola oil