Change to canola oil from vegetable oil
Merge branch 'master' into different-oil

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

Change to canola oil from vegetable oil