merge with no-ff
fix bug 101
merged bug fix 101
fix bug 102
Merge branch 'dev' of https://github.com/havedoor/learngit into bug102