added file1.txt to the master
pull from the server origin