Importeren
Merge branch 'mark' into danny
Laatste versie
Merge branch 'mark'
Merge branch 'mark'

Conflicts solved:
	Bibliotheek uitleensysteem/Bibliotheek.java
Merge branch 'master' into danny