branch2 test 2

branch2 test 2
resolved conflicts
Merge pull request #4 from xinningsu/thomas_branch2

branch2 test 2