Initial server commit
Merge pull request #1 from moltouni/server

Initial server commit