changes to canola instead of vegetable oil
Merge branch 'master' of https://github.com/douglasvaghetti/recipes into different-oil

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

changes to canola instead of vegetable oil