Webserver is basically done, some Java updates
Merge branch 'master' of https://github.com/jchilton1/fireside-chat