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

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

Update oil