Replaced vegetable oil with canola oil
Merge branch 'master' of https://github.com/melm88/recipes into different-oil

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

Replaced vegetable oil with canola oil