receiveFile
Merge origin/master

Conflicts:
	ClientSTF/src/Client/Client.java
receive file