Change "vegetable oil" to "canola oil"
Fix spelling of "canola"
Merge branch 'master' into different-oil

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

Change "vegetable oil" to "canola oil"