Change vegetable oil to olive oil
Fix typo - olive not oliver!
Merge remote-tracking branch 'origin/master' into different-oil

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

Change vegetable oil to olive oil