Begin merge in web server code
Merge pull request #1 from henryeherman/webdevel

Begin merge in web server code