diff oil
Merge branch 'different-oil' of https://github.com/nachohb/recipes into different-oil

Conflicts:
	cake-recipe.txt
canols
canola
Merge pull request #2 from nachohb/different-oil

Use canola oil instead of vegetable oil