basic server
Merge pull request #4 from raymondma1/master

basic server
conflicts