added newbranch-readme and modigied readme.txt
added new branch-readme.txt
fixed conflict