change player names
Merge branch 'master' into restart

Conflicts:
	js/view/board.js
don't reset anything