[x] Aufgabe 2
Merge branch 'master' of https://github.com/quaestor/ontosweb

Conflicts:
	uebung6.tex