testfile2 changes made on origin/mytest2
Merge branch 'mytest2' of https://github.com/liaohexiang/mytest into mytest2