add branch1 test
add branch2 test
add branch1 test
master add branch1 test in .h
Merge branch 'branch2'
change s to x
Merge branch 'branch2'