add readme.txt
second add readme
change read
conflict fixed
add test1
merge with no-ff
fix bug 101
mergerd bug fix 101
add read.txt
Merge branch 'dev'
commit readme
Merge branch 'dev'