test
Merge branch 'master' of https://github.com/dayutianfei/chimera.git

Conflicts:
	doc/README