uc-dipp/uc-dipp.github.io — pull request #7 by lucaluca (2014-07-24 00:00:45+00:00)
Title: Merge branch 'patch-1' of https://github.com/iadumitriu/uc-dipp.github.i...

...o into iadumitriu-patch-1

Conflicts:
index.html