Secondo commit
Merge branch 'Sviluppo3'

Conflicts:
	README.md