Lots of changes
StatMaster got renamed
Merge branch 'master' of https://github.com/AmoebaMan/CombatMods

Conflicts:
	config.yml
	plugin.yml
	src/com/amoebaman/combatmods/CombatMods.java