sistemato conferenza
Merge branch 'master' of https://github.com/Pardis89/Prova