branch test
And Simple
& simple
conflict fixed
add merge
merge with no-ff
add test
fix bug 101
merged bug fix 101
add hello.py
Merge branch 'dev' of github.com:hq2005001/learngit into dev