add 2.txt
Merge branch 'master' into new_2