From 1
Merge branch 'master' of https://github.com/netzwerg/git-playground

Conflicts:
	foo.txt