Conclusie dingen toegevoegd
Merge remote-tracking branch 'origin/master'

Conflicts:
	verslagen/tussenrapport/#tussenrapport.lyx#
Merge branch 'master' of https://github.com/13093053/dachoppah
Merge branch 'master' of https://github.com/13093053/dachoppah