new readme.txt
branch test
and simple
$ simple
fix
add merage
merge with no-ff
fix bug 101