Improved Git Global Configuration: Editor, MergeTool & Colorfull Output
Merge branch 'master' of https://github.com/slashsBin/dotStar

Conflicts:
	.gitconfig