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

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

Change oil to canola from vegetable.