branch test
ADD simple
& simple
conflict fixed
add merge
merge with no-ff
add hello.py
fix bug 101
merge bug fix 101
leran git