rename player to camera
refactoring camera
merge
fix for camera