add merge
merge with no-ff
fix bug 101
merged bug fix 101
bug branch commit
merge bug branch dev
modified hello.py
merge dev modified hello.py