add a new file on the dev branch
update readme.txt
update the readme.txt in the master
conflit readme.txt
sjofe
second