fffffffffffffff
Merge branch 'dev'

Conflicts:
	readme.txt
ADD simple
& simple
conflict fixed
add merge
merge with no-ff