Merge remote-tracking branch 'origin/thorins_branch' into branch/dlabordus
Merge branch 'branch/dlabordus'

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

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

Conflicts:
	README.md