poging gitignore werkend
probeersel
Merge branch 'master' of https://github.com/Wuisch/IPSEN5

Conflicts:
	.idea/workspace.xml
Merge branch 'master' into dirk

Conflicts:
	.gitignore
	.idea/workspace.xml