Just use normal merges for sln and csproj files.
Merge remote-tracking branch 'origin/master' into gitattributes-added

Conflicts:
	GitTfs.sln