my test
fixed conflix
Merge pull request #5 from xinningsu/thomas_branch3

my test