some edits
Merge branch 'master' of https://github.com/martinzhang/myHelloWorld

Conflicts:
	HelloWorld/src/tset/Setest.java