changed to canola oil
Merge branch 'master' of github.com:friedsam/recipes into different-oil

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

changed to canola oil