int in class
Merge branch 'master' of
https://github.com/edomello/ProgettoIngSoftware.git

Conflicts:
	ProgettoDevelop/src/PackageProva/Prova.java
Merge branch 'master' of https://github.com/edomello/ProgettoIngSoftware.git
Uml aggiornato!