update test.go
Merge branch 'master' of github.com:szqh97/test

Conflicts:
	go/test.go
Merge branch 'master' of github.com:szqh97/test