nihao
jintian
AND
a&&
merge branch 'wangbo'

Conflicts:
	read.txt