comments
Merge branch 'master' of https://github.com/mindisx/P6

Conflicts:
	ServerPC/src/FileTransfer.java