no message
ignore node_modules
Merge branch 'high_score' into feature/controll

Conflicts:
	.gitignore
	web/js/ioinit.js
	web/js/player.js
	web/leaderboard.json
	web/server.js