riscrivo l'html
Merge branch 'master' of https://github.com/cvdlab-cg/438775

Conflicts:
	2014-05-16/index.html
	2014-05-16/index.html~