Add server
Merge pull request #1 from awwest/master

Add server