.
Merge branch 'master' of https://github.com/a0lex/SemanticWeb

Conflicts:
	Extern.bib
	SemanticWeb.pdf