doneskis
Merge branch 'master' of https://github.com/syreal17/SIMPL

Conflicts:
	Easy resolve
	SIMPL/src/protocol/LoginPacket.java