gitconfig: new name
gitconfig: some senseless name
Merge branch 'hello-from-the-past' woot!

Conflicts:
	gitconfig