dev branch
add readme.txt test
and hello
& fiaho
conflict fixed
add merge
merge with no-ff
fix bug 101
merge bug fix 101