basic server running
pulled from master
merged master
Merge pull request #13 from raymondma1/master

basic server running