gvim difftool and line endings True for Windows
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitconfig
better pasting