More changes to foo
Merge branch 'master' of https://github.com/netzwerg/git-playground.git

Conflicts:
	foo.txt