Stun
Merge branch 'master' of https://github.com/Frotty/thwcontest

Conflicts:
	wurst/content/heros/crusader/Crusader.wurst
Merge branch 'master' of https://github.com/Frotty/thwcontest

Conflicts:
	wurst/content/heros/crusader/Crusader.wurst