remind contributors to merge
Merge branch 'master' into beispielloesungen