it's ok
Merge branch 'master' of https://github.com/KPTestRD/kptest

Conflicts:
	gittrial/gittrial/stdafx.cpp