test
idea
Merge branch 'master' of https://github.com/izhangxiaobo/gotest

Conflicts:
	.idea/workspace.xml