a
Merge branch 'master' of https://github.com/lucianoq/lod-project-slides

Conflicts:
	main.pdf
asd
asd