mac commit
Merge branch 'master' of github.com:zhangjinling/gitsKills

df
:wq
 the commit.