Simple server implementation
Merge branch 'master' into server
filed is required
Merge pull request #3 from DamonOehlman/server

Server