some stuff
Merge branch 'master' of https://github.com/zn4ke/student-response

Conflicts:
	client/js/controllers.admin.js
	client/js/controllers.player.js
	client/views/layout.jade
	client/views/partials/admin.jade
	client/views/partials/player-admin.jade
	package.json
	server/controllers/socket.js