aaa
Merge branch 'master' of github.com:kpchen/learnGitBranching

Conflicts:
	v2.txt