Aggiunta riga 6
risolto conflict merge
Merge branch 'master' of https://github.com/MarcoComolli/Tirocinio