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

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

Changed oil