again add gitskills
Merge branch 'master' of github.com:BevisZheng/learngit
AND simple
& simple
conflict fixed