test
Merge branch 'test'
Very things
Merge branch 'origin/master'

Conflicts:
	player.cpp