Merge pull request #1 from xinningsu/thomas_branch1

test 1
branch2 test 2

branch2 test 2
Merge pull request #3 from xinningsu/thomas_branch1

branch1 test2
resolved conflicts
Merge pull request #4 from xinningsu/thomas_branch2

branch2 test 2
fixed conflix