modify readme.txt
modify readme.txt in branch dev
AND
&
conflicts fixed
test merge with ff
Merge branch 'newbranch'

Conflicts:
	readme.txt
modify readme.txt
Merge branch 'newbranch'

Conflicts:
	readme.txt
test merge
test merge without ff comit
add merge
test merge with ff commit
Merge branch 'dev'