merge with no-ff
fix bug 101
merged bug fix 101
restore and test again
branch test
AND simple
& simple
confict fixed
add merge
add hello.py & fixed bug