test 4 commit before pull
fixed merge in MasterServerNode for CreateFile
working on sending bytestream in test4
merging test4 into master
fixed merge conflicts