branch test
AND easy
& simple
conflick fixed
add merge
merge with no-ff
fix bug 101
merge bug fix 101