changed
Merge branch 'master' of https://github.com/borutzn/recipes into changed-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from borutzn/changed-oil

changed