change readme by twins
gen conflict by twins
after merge after pull request
Merge branch 'Qsmoon-Master'