fixed kill function and added more playerName code

fixed kill function and added more playerName code
Merge branch 'John-DiBaggio'

Conflicts:
	js/main.js