simple server
Merge pull request #1 from jlburkhead/master

simple server