account half af ..
Merge branch 'master' of https://github.com/fieldhof/2.1InternetTechnologie

Conflicts:
	bin/client/Client$ServerListener.class
	bin/client/Client.class
	bin/server/Server$ClientThread.class
	bin/server/Server.class
	src/client/Client.java