체인지2
Merge remote-tracking branch 'origin/test'

Conflicts:
	cPlayer.cpp