updating testfile for testgit2
master modification for testfile.txt
merging modification in testfile.txt
newfile commit
modification commit