Added resizeability to Player
fixed merge conflict in Player