updated test2
updated test2.txt
merged files