Extended git config
Merge branch 'master' of github.com:amaunz/home-bin
Merge branch 'master' of github.com:amaunz/home-bin
Merge branch 'master' of github.com:amaunz/home-bin

Conflicts:
	.gitconfig