commit 2
Merge branch 'branch02'

Conflicts:
	.idea/workspace.xml
merge with master
Update HelloWorld.java
Merge branch 'master' into branch02

Conflicts:
	.idea/workspace.xml