WE
Merge branch 'master' of https://github.com/marcphilipp/git-workshop-playground

Conflicts:
	README.md
Merge branch 'master' of https://github.com/marcphilipp/git-workshop-playground
änderung im fork
Merge branch 'master' of https://github.com/marcphilipp/git-workshop-playground