Hello world web server in Java, with an additional error page
Merge remote-tracking branch 'origin/master'