Merge branch 'master' of https://github.com/skyboy180/test

Conflicts:
	xixihaha.txt
修改编码格式
Merge branch 'master' of https://github.com/skyboy180/test.git