user 2 changed something
Merge branch 'master' of https://github.com/ymxie/Trial

Conflicts:
	HelloWorld/src/HelloWorld.java