master/test-branch
Merge branch 'test-branch'

Conflicts:
	TestRepoGit/Class1.cs
newvar3-master
Revert "newvar3-master"

This reverts commit 89ce0e14e43c1c4d5be288f4bc17e8efc51fda0a.