Merge branch 'master' into feature1
adding test file
removed class.cs
Merge branch 'feature1'