update the testing code
Merge branch 'master' of github.com:fanliao/gotest

Conflicts:
	main.go