Change vegetable oil to canola oil
Fix typo in "canola"
Merge branch 'master' into alternate-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from billykmarshall/alternate-oil

Change vegetable oil to canola oil