branch test
AND simple
& simple
conflict fixed
add gitSkill
add merge
merge with no-ff
Merge branch 'master' of https://github.com/jeremyyoung2014/KnowHowGitOnline