Use canola oil instead of vegetable oil
Fix typo in canola
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
added new recipe
added a new spice
cumin smth
Merge branch 'master' into different-oil
sarah changes, more oil
Merge pull request #1 from hannavihma/different-oil

Different oil