changed vegetable oil to conola oil
changed spelling of canola
Merge branch 'master' into different-oil

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

changed vegetable oil to conola oil