Switch from vegetable oil to canola oil
Merge branch 'master' of https://github.com/jbrunette/recipes into different-oil

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

Switch from vegetable oil to canola oil