Revert "und nochmal"

This reverts commit 90b3fac9e499d9713a1d3eb4de28d21ffcc8972a.
Revert "Revert "und nochmal""

This reverts commit 946d8cac8344b333866db4c24c83c2c51b46ab1c.
Merge branch 'master' of https://github.com/Uniltaron/Projektseminar
I have no clue, what I'm doing here, hopefully fixing stuffXD