changes to spawn and name/label players correctly

changes to spawn and name/label players correctly
Merge branch 'John-DiBaggio'

Conflicts:
	js/main.js