555
Merge branch 'master' of github.com:huangyunbin/blog2

Conflicts:
	1.txt