Add different-oil
Merge branch 'master' of https://github.com/Steeze/recipes into different-oil

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

Add different-oil