deng branch
deng new
deng2
Merge branch 'deng'

Conflicts:
	newtest.txt
1815