branch test
& simple
AND simple
conflict fixed
my ideas
git add readme.txt
merge with no-ff
fix bug 101
merged by=ug fix 101