deleted server helper require lines from server.js
merge conflicts resolved
splash page styling
Merge pull request #32 from KyleW/presentsocket

Splashpage styling