deleted server helper require lines from server.js
Merge pull request #31 from KyleW/auth

Fixed master. No functional changes.
added passport-opendid module
a clean start on auth
merge conflicts resolved
basic plumbing for checking accounts working, except for validating password
login works except for deserializing
basic login is working
splash page styling
Merge pull request #32 from KyleW/presentsocket

Splashpage styling
Merge branch 'master' into openid
Merge pull request #33 from KyleW/openid

the login page works
Some DJ UI work and improved functionality
Merge branch 'master' into slide-transitions

Conflicts:
	client/index.html
	client/src/app.js
Merge pull request #34 from KyleW/slide-transitions

DJ controller now updating database correctly
and now you can create users as well
Merge branch 'master' into auth