test
Merge branch 'master' of https://github.com/xfm84/test

Conflicts:
	Clip/lib/libcurl.dll
	Clip/lib/libcurl.lib
	Clip/lib/libcurld.dll
	Clip/lib/libcurld.lib