Fixed a bunch of broken stuff
Merge branch 'temp'

Conflicts:
	server.js
Merge branch 'master' of https://github.com/nmalkin/wordplay