add good to readme.txt
add bad girl on dev
resolute conflict