Use canola oil insted of vegetable oil
Correct the misspel in oil's name
Merge branch 'master' into different-oil

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

Use canola oil insted of vegetable oil