Second commit
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/necst/ispa14.necst.it into gh-pages