add readme
second commit
add line for readme
edit conflict README