Git push configuration
Merge branch 'master' of github.com:cmaureir/conf-files

Conflicts:
	.gitconfig