used olive oil
Merge branch 'master' of github.com:thomasZen/recipes into different-oil

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

used olive oil