no message
Merge branch 'master' of https://github.com/ablood/WinPlotter

Conflicts:
	WinPlotter/WinPlotter.vcxproj.filters