nieuw tekst
blabla
Merge remote-tracking branch 'origin/master'

Conflicts:
	__pycache__/dashboard.cpython-34.pyc