canola oil insted of vegetable oil
Merge branch 'master' into different-oil 3/4

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

canola oil insted of vegetable oil