non
merege
server updater hookup
Merge branch 'master' of https://github.com/Ragestorm/DUCA-Chat

Conflicts:
	DUCA-Chat/client.txt
	DUCA-Chat/src/server/ServerUpdater.java
	DUCA-Chat/src/server/TCPServer.java