unbreaking the build
Merge branch 'master' of https://github.com/Nunnery/SkillMC.git

Conflicts:
	src/com/conventnunnery/plugins/SkillMC/data/SkillMCPlayer.java