begin
begin
Merge remote-tracking branch 'origin/MainBranch' into MainBranch

Conflicts:
	.idea/workspace.xml
	src/Main.java
Merge remote-tracking branch 'origin/MainBranch' into MainBranch
add Methodes voor de sets toegevoegt