handling ack client and server
Merge branch 'master' of https://github.com/hysst/cofp1.git

Conflicts:
	TCPServer/src/connexion/ServerThread.java