add readme.txt
modify readme
& simple
conflict fixed
add merge
merge with no-ff
hello
world
hello world
hello-world
merged bug issue-101
newfile