Wat opschoningen
Merge branch 'master' of https://github.com/redwhitemike/Project-FYS

Conflicts:
	Afhandelingssysteem/build/built-jar.properties