made a change from testing branch
Merge branch 'testing'

Conflicts:
	dianxin/TestMain.java