commit again
add binbin
add 8
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/liwen/liwen.java