Update player.c
Update player.c
Update player.c
Update player.c
Update player.c
Update player.c
Update player.c
Update player.c
Update player.c
Update player.c
Update player.c
Update player.c
Update player.c
Update player.c
Update player.c
Update player.c
Merge branch 'pr/5'

Conflicts:
	player.c