Revert "immer noch vor erstem merge (p.s.: ich hasse git :(()"

This reverts commit d9b0b8abcf3584880957a9d3be4917d47f4ae256.
Merge branch 'master' of https://github.com/praiser/kampfrichter.git
test