edit readme.txt on dev
merge dev to master with no-ff
new thing on dev2
new change