Splat changes
 * Fix bug with the way players are determined
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/scenes/game_leonard.unity