Replace vegetable oil for canola oil
Merge branch 'master' into different-oil
Conflict: cake-recipe.txt
Merge pull request #1 from edgaromar90/different-oil

Merge pull request #1 different-oil into master