added new.txt
added new2
merge from branch1, added new23
two to new2
another to new2
merge branch1