Add new oil
Merge branch 'master' into diff-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from trixr/diff-oil

Add new oil