Border collision and player name
Merge branch 'master' of https://github.com/ViktorDB/backend_web_game

Conflicts:
	game/Player.js
	game/public/js/Player.js
	game/public/js/game.js