Replace vegetable oil -> canols oil
fix canols oil -> canola oil
Merge branch 'master' into different-oil

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

Replace vegetable oil -> canols oil