Server&Client
sa
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client_update/.idea/workspace.xml
	File_Sender/src/file_sender/File_Sender.java