masterchange
dfswdf
Merge branch 'master' into test-branch2

Conflicts:
	TestRepoGit/Class1.cs