Voorlopige commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	code/cpl_assignment2/src/connector/DatabaseInterface.scala