hehe :-P
Merge branch 'thorins_branch' into marc

Conflicts:
	README.md
Merge branch 'marc'

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