Merge branch 'master' of C:\Users\Roman\3. Semester\WAW_Projekt\3_semester with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/detail.js
changed: detail.html

Funktion ausblenden() visibility zu display geändert.