AND simple
& simple
conflict fixed
add merge
merge with no-ff
fix bug 101
dev readme.txt
Merge branch 'dev'