Merge pull request #2 from dongqingwang1984/test_2

test_merge_pull_request_2
test_work_on_same_branch again