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

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

Change vegetable oil to canola oil