Add canola oil to cake recipe
Fix typo in canola
Merge branch 'master' into different-oil

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

Add canola oil to cake recipe