branch test
AND simple
& simple
conflict fix
add merge
merge with no-ff
fix bug 101
merge bug fix 101
commit current branch
Merge branch 'master' into dev
delete hello.px
fix bug 102
merge bug fix 102
commit hello.py
Merge branch 'master' into dev
modify readme.txt