Ciao Ciao
Merge branch 'master' of https://github.com/dmazzoni/SWE-Assign2

Conflicts:
	src/it/univr/swe/gui/MainWindow.java