Use olive oil
Merge branch 'master' into different-oil

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

Use olive oil