Merge branch 'master' of https://github.com/SheerAwesomeness/ClassPvP

Conflicts:
	src/ClassPvP.java
Merge branch 'master' of https://github.com/SheerAwesomeness/ClassPvP

Conflicts:
	src/ClassPvP.java
Merge remote-tracking branch 'origin/master'
Fake Enchant Utility