SetterTest aanpassing
Merge branch 'master' of https://github.com/woosting/repo

Conflicts:
	TESTAPP/src/CombineHelloWorld.java
	TESTAPP/src/SetterTest.java
Merge branch 'master' of https://github.com/woosting/repo

Conflicts:
	TESTAPP/src/CombineHelloWorld.java