Merge branch 'master' of https://github.com/Jfeurich/Themaopdracht2

Conflicts:
	Themaopdracht/src/domeintests/KlantServletTest.java
wut