database

database
Merge remote-tracking branch 'origin/Kai'
db-config ingevuld
Merge remote-tracking branch 'origin/master' into Kai