Problems in the upload...
Merge branch 'master' of git@github.com:JGAntunes/RedesComp.git
some syntax bugs
Merge branch 'master' of git@github.com:JGAntunes/RedesComp.git

Conflicts:
	RedesComp/src/socketwrappers/ClientTCP.java