roemer added text to roemerisaddingfiles
Merge branch 'roemerhavingfun'

Conflicts:
	roemerisaddingfiles
fixed
Merge branch 'master' of git@github.com:fieldtrip/playground
bestandje toegevoegd
blabla erbij
johanna fun
added comment
added comment
added an assignment for everyone
that totally works?
Merge branch 'roemerhavingfun'

Conflicts:
	roemerisaddingfiles
Merge branch 'master' of git@github.com:fieldtrip/playground
quickly!
enhancement - changed assignment