merge with no-ff
fix bug 101
merged bug fix 101
Merge branch 'dev' of https://github.com/yudozhan/testgit
add 2 lines in py