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

Conflicts:
	CTest/Application.aps
Merge branch 'master' of https://github.com/xfm84/ctest

Conflicts:
	CTest/Application.aps
	CTest/Application.rc
	CTest/CTest.vcxproj.filters
	CTest/TouchDlg.cpp
vk map