Mijn aanpassing
Merge branch 'master' of https://github.com/polyanos/VH5.git

Conflicts:
	factuur/src/factuur/main/Main.java
Merge branch 'master' of https://github.com/polyanos/VH5.git
Mark aangepast
Merge branch 'master' of https://github.com/polyanos/VH5.git