merge bug fix 101
Merge branch 'master' of https://github.com/lecion/learngit