Some concurrent changes
Conflict resolved
Merge pull request #2 from RapidScada/develop

Added myclass.cs
Changes in master
Resolved
Merge pull request #3 from RapidScada/master

Request 3