implementation nearly finished
Merge branch 'master' of github.com:SRechenberger/Sopra_Team16_12