canola oil instead of vegetable oil
Merge branch 'master' of github.com:White-Hawk/recipes into different-oil

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

canola oil instead of vegetable oil