merge with no-ff
fix bug 101
merged bug fix 101
merged dev
merged dev
merged dev2
merged dev3
modify hello.py
merged master