test
Merge branch 'master' of https://github.com/xiajingchuan/pyramid-chinese

Conflicts:
	tests.md