Merge
Merge branch 'master' of git@github.com:Maestro1337/ssha.git

Conflicts:
	src/Model/Skills/Wizard/SkillFirestorm.java
Merge branch 'master' of git@github.com:Maestro1337/ssha.git
Players now get added ONE time to the "deathlist" when calculating
goldreward