Verbesserungen
Merge branch 'master' of github.com:gillesB/masterThesis
resolved merge conflicts
gewunschte Features Anfang