Changed oil from vegetable to canola at the cake recipe
Merge branch 'master' into different-oil

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

Changed oil from vegetable to canola at the cake recipe