car
Merge branch 'palma-branch' into pete&elyse

# By Pascal Alma (2) and dtunovic (1)
# Via Pascal Alma
* palma-branch:
  oyeah
  Revert "Yeah."
  Yeah.
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