branch test
AND simple
& simple
conflict fixed
change readme file
merge with no-ff
git is free software
fix bug 101
merged bug fix 101