final update

update?

current stuff

Revert "nuffin"

This reverts commit
6a5db5d4cacb631efa217262ac8088b5c70ff393.

nuffin
more change?
Merge remote-tracking branch 'origin/master'

Conflicts:
	DUCA-Chat/src/client/ClientOut.java