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
testfile changed
änderung im fork
Merge branch 'master' of https://github.com/marcphilipp/git-workshop-playground
Merge pull request #2 from engelhjs/master

Änderung im Fork
Merge branch 'my_branch'