Merge branch 'different-oil'

Conflicts:
	cake-recipe.txt
Merge branch 'master' of https://github.com/fiddlermike/recipes

Conflicts:
	cake-recipe.txt