foo1 added
method foo2 is created
Merge remote-tracking branch 'origin/br1'

Conflicts:
	TestProject/TestClass.cs
code format cleaning