#18-2
Merge branch 'master' of https://github.com/yoyoofmine/strawer.git

Conflicts:
	yui/src/strawer/README.md
	yui/src/strawer/text.txt