branch test
And simple
& simple
conflict fixed
add merge
merge with no-ff
fix bug 101
add hello.py
add path
add coding
merge & fix readme.txt
delete coding
delete path
merge & fix confilc of readme
Merge branch 'dev'