foo1 added
Merge remote-tracking branch 'origin/br1'

Conflicts:
	TestProject/TestClass.cs
code format cleaning
Merge remote-tracking branch 'origin/br1'
method1 is added
Merge remote-tracking branch 'origin/br1'

Conflicts:
	TestProject/TestClass.cs
class added 'masterclass'
merge project
fixing wrong merg