oefening 2
bla
Merge branch 'branch/dlabordus' into thorins_branch
Merge branch 'thorins_branch'

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

Conflicts:
	README.md