Add canola oil instead of vegetable oil
Fix misspelled can to canola
Merge branch 'master' into different-oil

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

Add canola oil instead of vegetable oil