Change vegetable oil to olive oil
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
Merge pull request #2 from tony-whtseng/different-oil

Different olive oil amount