change vegetable oil to canola
Merge branch 'master' of https://github.com/bendespain/recipes into different-oil

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

change vegetable oil to canola and 3/4