Change to canola oil...
Add some flexibility in oil...
Merge branch 'master' into new_oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from natbirrer/new_oil

Change to canola oil...