new changed
Merge remote-tracking branch 'origin/master' into Topic1

Conflicts:
	HelloWorld/src/Hello2.java