Quickly prototyped webserver to display database.
Merge remote-tracking branch 'origin/master'