add dev branch
modify test file
modify master readme.txt
fix conflicts
m master readme2.txt
fff
Merge branch 'dev'