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

Conflicts:
	pcf_seminario.pdf
Un altro commit di prova... sigh...
Merge branch 'master' of github.com:cherosene/linguaggi14

Conflicts:
	pcf_seminario.pdf