niet kapot gaan? :D
Merge branch 'master' of https://github.com/Tim108/Concordia13

Conflicts:
	src/main/webapp/collectie.jsp
Merge branch 'master' of https://github.com/Tim108/Concordia13

Conflicts:
	src/main/webapp/collectie.jsp