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