add new test1.txt
Merge branch 'master' into development
update test2 changes to dev branch