prova

prova
ProvaModifica
Revert "ProvaModifica"

This reverts commit 0e7f1099b8fe1edeb5b60f389690ff7ebdbf3576.
ProvaCommit2
Merge pull request #8 from silviomar/master

Prova
Cancellato file prova
Merge pull request #9 from ga22/master

cancellato
Test
Revert "Test"

This reverts commit c9ab6502bc80a97101b505c97ba6db9236d6c38a.
File
Merge pull request #10 from rvenafra/master

MyUpdate
myFirtstConflict
Merge pull request #12 from rvenafra/master

MyConflict
Merge git://github.com/sytelUiip/projectWork

Conflicts:
	readme.txt
Architettura