Change oil for cake
Merge branch 'master' of https://github.com/jorgecastillo1024/recipes into different-oil

Conflicts:
	cake-recipe.txt
Corrected a typo in canola oil
Merge pull request #2 from jorgecastillo1024/different-oil

Change oil for cake