WIP adding user accounts
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/js/join.js
	client/js/tutor.js