changed
try
Merge branch 'master' into TestBranch

Conflicts:
	GitTest/GitTest.cpp