team page
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	website/css/stylesheet_temp.css
update werk 20-3 voormiddag