Merge branch 'master' of https://github.com/trc202/Combat-Tag

Conflicts:
	CombatTag/com/trc202/CombatTagListeners/NoPvpPlayerListener.java
	plugin.yml