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

Splashpage styling
Merge branch 'master' into openid