Updated and cleaned
Fixing .gitconfig

Conflicts:
	.gitconfig