Oil added
new oil
Merge branch 'master' into different-oil

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

Oil added