Geen verandering (github fix)
Merge branch 'master' of https://github.com/Multec/Multec_IM_13_5

Conflicts:
	src/MainSlashTag.java
	src/be/pandapp/ehb/Slashing.java