stuff done
Merge branch 'master' of https://github.com/bobtheblueberry/ServerPack

Conflicts:
	ServerCore/src/me/toxiccoke/servercore/Events.java
Events.java