branch test
&simple
and simple
conflict fixed
--no-ff
Merge branch 'dev'

Conflicts:
	readme.txt
--no-ff
Merge branch 'dev'