Add olive oil instead of vegetable
Merge branch 'master' into different-oil

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

Add olive oil instead of vegetable