players can't play by themselfs
Merge branch 'master' into pairings

Conflicts:
	app/routes/match.js