add a readme txt to dev
AND simple
& simple
conflict fixed
add merge
merge with no-ff
fixed bug 101
merged fixed bug 101
add test dev
fix merge dev bug