Added file sending code to the server
resolved conflict