Working on client threads
Merge branch 'master' of https://github.com/syreal17/SIMPL

Conflicts:
	SIMPL/src/client/Client.java