add readme.txt
add merge
merge with no-ff
issue modify
merged bug fixed by 101
conflict fixed