Adding git files.
Merge branch 'master' of https://github.com/arriolac/dot-files

Conflicts:
	.gitconfig