Create Server
Create Client
Merge pull request #1 from GeorgeBely/master

Catch changes