game route, but need to update users on load
Merge branch 'kyle'
room update
Merge branch 'kyle'

Conflicts:
	dev-duel.html
	dev-duel.js
bunch of updates