setting up test 1
Merge branch 'master' into branch1

Conflicts:
	TestMerge/TestMerge/Test1/Class1.cs
setting up test 2
merging changes
cleaning