links gefixed
Merge branch 'master' of https://github.com/Tim108/Concordia13

Conflicts:
	src/main/java/coreServlets/ExpositionServlet.java