socket.io works fine
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	views/subjectEditor.jade
socket.io works fine