Stability stuff.
Merge branch 'master' of http://github.com/willcrichton/virtualclassroom

Conflicts:
	server.js