new
Merge branch 'master' of https://github.com/JinksPeng/Lgit

Conflicts:
	codeSchool-git/001 copy.txt