test2
Other change in readme.
oefening 2
Do not delete please.
Merged

Conflicts:
	do_not_delete_denis.txt
Merge branch 'palma-branch'
Merge branch 'master' of https://github.com/bkummel/git-playground
Merge branch 'denis' of https://github.com/bkummel/git-playground into marc
Merge commit '7fa44903a845c73bf1fb1f0cedb9e2b4afc926ed' into Mike
denis pesten
Merge branch 'master' of https://github.com/bkummel/git-playground
bla
Merge branch 'master' of https://github.com/bkummel/git-playground

# By Marc Riesewijk (2) and dtunovic (1)
# Via Marc Riesewijk (3) and others
* 'master' of https://github.com/bkummel/git-playground:
  denis pesten
  Do not delete please.
  marc nog een keer
Merge branch 'branch/dlabordus' into thorins_branch
Merge branch 'Mike'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/bkummel/git-playground
Merge branch 'thorins_branch'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/bkummel/git-playground

Conflicts:
	README.md
Merge commit '2dad6d256ed209e571b1098ac7c3182a68e49ec0' into pete&elyse