Create test
Merge branch 'master' of https://github.com/wzpcpp/gittest

Conflicts:
	test