added file merging logic
Merge branch 'master' of https://github.com/cavasquez/PseudoTorrent