Project merge mixup
Merge branch 'master' of github.com:ltouroumov/sharptools

Conflicts:
	SharpTools.csproj