added basic file sending and receiving capability
Merge remote-tracking branch 'origin/master'