Deathmatch changes
Merge branch 'dev' of https://github.com/propra13-orga/gruppeA3 into dev