Merge branch 'master' of github.com:cherosene/linguaggi14

Conflicts:
	pcf_seminario.tex
Merge branch 'master' of github.com:cherosene/linguaggi14

Conflicts:
	immagini/tavolo_b.svg