Use canola oil instead of vegetable oil
Merge branch 'master' of https://github.com/grimesmea/recipes into different-oil

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

Use canola oil instead of vegetable oil