dev readme.txt
dev readme
master readme
confilct fixed
dev readme new content
confilct fixed again
merge