modify readme and add new file
add a line to readme
add line from master
add new file for hotfix
finish test branch
solve merge conflict