Merge pull request #1 from vtthien/Branch-01

Branch-01 add test.cs
add some conflict to test.cs with test.cs on Branch-02
conflict solve
Branch-02 add new int member
branch 02 conflict