Fixed merge
Updated documentation and slight refactoring of Server.hs
Minor fix main.js