测试
ff
Merge branch 'master' of https://github.com/osisky/common

Conflicts:
	test_common.cpp
Merge branch 'master' of https://github.com/osisky/common
Merge branch 'master' of https://github.com/osisky/common
ceshi