Oh the joys of javascript contexts.
Merge remote-tracking branch 'origin/monitorClass' into monitorClass

Conflicts:
	server.js