VSk12
Merge branch 'master' of https://github.com/pentiumpc02/VSRepo

Conflicts:
	VSTest_Proj/App.config