new branch, modified readme.txt
master has modified the readme.txt
conflict fixed
fix bug 101
merged bug fix 101