We got some auth and cookie buisness. (running locally)
Also made whatever I pulled run properly…
Taking functionality out of the app.js file so that we can switch between database and no database and do stuff for testing.
change the code to nico's version
whatever
Merge branch 'master' into CookieServe

Conflicts:
	app.js
	node_modules/socket.io/node_modules/redis/package.json
	node_modules/socket.io/node_modules/socket.io-client/node_modules/uglify-js/package.json
	node_modules/socket.io/node_modules/socket.io-client/node_modules/xmlhttprequest/package.json
	node_modules/socket.io/node_modules/socket.io-client/package.json
	node_modules/socket.io/package.json
	package.json
	public/javascripts/login.js
	views/includes/scripts.jade
	views/layout.jade