Kapital dingsda
Merge branch 'master2' of git@github.com:MarcNBecker/Planspiel.git into master2