added clientconnection
deleted client.
more deletes
Merge branch 'master' of https://github.com/pcfascinated/Chatrix.git

Conflicts:
	Chatrix/src/client/Client.java
	Chatrix/src/core/ChatrixLauncher.java
	Chatrix/src/server/Server.java