added test2.txt
added testing.txt
commit
Merge branch 'master' into test