branch test
ADN simple
& simple
conflict fixed
add merge
merge with no-ff
new line on dev
Merge branch 'dev'
fix bug101
merge bug fix 101