saluto to master
saluto opsite due
Merge branch 'master' into ospite

Conflicts:
	Tester/src/master/Saluto.java