Merge branch 'patch-1' of https://github.com/iadumitriu/uc-dipp.github.i...

...o into iadumitriu-patch-1

Conflicts:
	index.html