comments @ backupserver
merged
Merge branch 'tcp' of https://github.com/tkessels/publicMain.git into
tcp

Conflicts:
	publicMAIN/src/Backupserver.java