Add readme.txt
Add simple
& simple
conflict fixed
Add merge
Merge with no-ff
fix bug 101
Merge bug fix 101