Merge pull request #1 from mj201/subtree/testWorkingBranch

Subtree/test working branch
second modification to class1.cs
Merge pull request #2 from mj201/secondtestbranch

second modification to class1.cs
merged latest library branch
Merge commit '99f87872a9294420803717ce8fa5874992657464' into testWorkingBranch

Conflicts:
	library/Class1.cs