Super feature
Commit message edited in Atom
Wipe foo
From 1
From 2
Merge branch 'master' of https://github.com/netzwerg/git-playground

Conflicts:
	foo.txt
Merge branch 'master' of https://github.com/netzwerg/git-playground into feature