new branch add  readeMe.txto
a new test
add GPL
add test.txt
remove test.txt
add test.txt
add branch test
chmod
And simple
& simple
conflict fixed
a small change
conflict fixed
add merge
merge with no-ff
issue101 change the readeMe.txt
merged bug fix 101
change from feature1
merge feature1