resolved merge
Merge branch 'master' of https://github.com/borutzn/recipes

Conflicts:
	cake-recipe.txt