Merge pull request #9 from WrongEntertainment/master

update master
funding gesamtsumme
Merge pull request #15 from FH-Potsdam/master

update master