branch test
AND simple
& simple
conlict fixed
add merge
merge with no-ff
fix bug 101
merged bug fix 101
heh
Merge branch 'dev'