modificato nomefile
ok
Merge branch 'rename'

Conflicts:
	MyClass.java