branch dev change READEME
AND COMMIT
chg readme
conflict fixed
add 2.txt