user login/register
Merge branch 'master' of heroku.com:murmuring-chamber-2977 into kolja

Conflicts:
	client/css/basic.css
	server/js/routes/routes.js
	server/js/user/user.js
	server/views/header.jade