merge with on-ff
fix bug 101
merged bug fix 101
Git has different.
change
Merge branch 'dev' of https://github.com/xiaoxiaoyu/learngit into dev