Ready to merge
Merge branch 'master' of https://github.com/superleo-cn/studygit

Conflicts:
	hi.txt
	Resolved Already, now the version is 4