adding server
Merge https://github.com/csieira/socket