branch test
AND simple
& simple
conflict fixed
add lalala
merge with no-ff
fix bug 101
merge bug fix 101
now feature down
Merge branch 'dev'