Alternative zu 4.6
Merge branch 'master' of github.com:Faedrivin/DInf2014