Replace vegetable oil with canola oil
Fix for Canola
Merge branch 'master' into different-oil

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

Replace vegetable oil with canola oil