Added effects
Merge branch 'master' of https://github.com/DildoWieldingMidgets/DWM-Combat

Conflicts:
	src/com/runebrire/combat/spells/active/ActiveEffects.java

Added stuff to effects
Merge branch 'master' of https://github.com/DildoWieldingMidgets/DWM-Combat