pushy
Merge remote-tracking branch 'origin/master'

Conflicts:

	src/facturatieSysteem/VerzekeringSubsysteem/PresentationLayer/VerzekeringsmaatschappijGUI.java
Merge branch 'master' of https://github.com/Jeroen-N/Facturatie