branch test
modify readme.txt
and simple
& simple
conflict fixed
add merge
merge with no-ff
add new text
merged bug 101
aaaaaaa
merge dev
modify test.txt
merge test issue102
modify aaaa
fix confilcts test.txt