Added Server
Merge pull request #38 from mikephoran/master

Added Server