branch test
simple  word
and simple
& simple
conflict  solved
add xxx in master
modify readMe.txt
change readMe
Merge branch 'master' into dev