Added "Pippo"
Merge branch 'Branch2'

Conflicts:
	TestGitFinal/src/com/testgit/TestGitFinal.java