add test2.txt
Merge branch 'develop'