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

Conflicts:
	CTest.v11.suo
	CTest/Application.aps
	CTest/Application.rc
	CTest/CTest.vcxproj
	CTest/CTest.vcxproj.filters
	CTest/FloatDlg.cpp
	CTest/resource.h