Changed vegetable oil to olive oil
Merge branch 'master' into olive-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from jkbeck/olive-oil

Changed vegetable oil to olive oil