merge with no-ff
bug fix
feature ok
Merge branch 'issue-101'
2 comit
Merge branch 'dev' of github.com:hylong/learngit into dev