branch test
AND SIMPLE
& simple
conflict fixed
add merge
merge with no -ff
fix bug 101
merged bug fix 101
add hello.txt and modify readme.txt
merged dev