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

Conflicts:
	index.html
Merge pull request #7 from uc-dipp/iadumitriu-patch-1

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