Updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/connorlinfoot/blood/OnDamage.java
Version 2.0