add readme.txt
AND simple
master commit
conflict fixed
add merge
merege with no-ff