Merge branch 'master' of https://github.com/CarlAmbroselli/Studikochbuch

Conflicts:
	recipes/arme_ritter.md
	recipes/flammkuchen.md