Replace vegetable oil with olive oil
Correct spelling of 'olive'
Merge branch 'master' into different-oil

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

Replace vegetable oil with olive oil