worked on progress bar file transfer
Merge conflict solved