#17-1 #8-1
Merge remote-tracking branch 'origin/master'

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