Merge branch 'master' of https://github.com/AlessandroBregoli/Matrici

Conflicts:
	Matrice.py
Merge branch 'master' of https://github.com/AlessandroBregoli/Matrici