Rebase auf Masterstand
Merge branch 'master' into Nils
Merge pull request #14 from rbrueckner93/Nils

Nils
Merge branch 'Nils'
Konstruktor der Orte geändert
Merge remote-tracking branch 'origin/Nils' into Nils
Merge remote-tracking branch 'origin/master' into Nils
Update in Korridor. Fehler in Logik