InitMap e History riportati alla versione del prof
Merge remote-tracking branch 'origin/master'

Conflicts:
	CLIPS/history.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	CLIPS/history.txt