nr.7 ueberarbeitet
Merge branch 'master' of https://github.com/dominikwille/fp