dfswdf
Merge branch 'master' into test-branch2

Conflicts:
	TestRepoGit/Class1.cs
no message
no message
Merge branch 'test-branch2' into test-branch

Conflicts:
	TestRepoGit/Class1.cs