v1
h1
Merge branch 'master' of https://github.com/kpchen/learnGitBranching

Conflicts:
	v1.txt