branch1 8
Merge remote-tracking branch 'origin/branch1' into branch1

Conflicts:
	HelloWorld/src/main/Main.java
totlti i mesaggi <<<< di merge