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

Conflicts:
	src/ClassPvP.java