Tafel geflickt
Merge remote-tracking branch 'origin/chdrost'

Conflicts:
	src/tafelserver/Testklasse.java
	tafel.xml