new1
new->master

Conflicts:
	cPlayer.cpp