modified readme.txt
modified readme.txt
modified readme.txt
resolve confict
modified readme.txt