$a text
Merge branch 'dev_tinker' of github.com:xuwanwan/text

Conflicts:
	test.php