modify branch
master modify readme
second branch modify readme
manually fixed the conflics