aanpassingen
Merge branch 'master' into gh-pages

Conflicts:
	data_solutions.html