dev readme
master readme
conflict fixed
add merge